nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[webshop] shopping cart with shipping rule selector, totals

Browse Source
This commit is contained in:
Anand Doshi
2013-07-04 23:45:22 +05:30
parent a749996747
commit 0b4943cec1
7 changed files with 171 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/shipping_rule/shipping_rule.py
View File

@@ -58,7 +58,7 @@ class DocType(DocListController):
then condition y can only be like 50 to 99 or 301 to 400
hence, non-overlapping condition = (x1 <= x2 < y1 <= y2) or (y1 <= y2 < x1 <= x2)
"""
separate = (x1 <= x2 < y1 <= y2) or (y1 <= y2 < x1 <= x2)
separate = (x1 <= x2 <= y1 <= y2) or (y1 <= y2 <= x1 <= x2)
return (not separate)
overlaps = []