Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(various)

Browse Source
This commit is contained in:
Nabin Hait 2018-08-10 19:01:04 +05:30
parent 20fb443f0c
commit c35271aef5
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@ -237,14 +237,14 @@ def remove_pricing_rules(item_list):
def get_pricing_rules(args): def get_pricing_rules(args):
def _get_tree_conditions(parenttype, allow_blank=True): def _get_tree_conditions(parenttype, allow_blank=True):
field = frappe.scrub(parenttype) field = frappe.scrub(parenttype)
if not frappe.flags.tree_conditions:
frappe.flags.tree_conditions = {}
key = (parenttype, args[field], )
if key in frappe.flags.tree_conditions:
return frappe.flags.tree_conditions[key]
condition = "" condition = ""
if args.get(field): if args.get(field):
if not frappe.flags.tree_conditions:
frappe.flags.tree_conditions = {}
key = (parenttype, args[field], )
if key in frappe.flags.tree_conditions:
return frappe.flags.tree_conditions[key]
try: try:
lft, rgt = frappe.db.get_value(parenttype, args[field], ["lft", "rgt"]) lft, rgt = frappe.db.get_value(parenttype, args[field], ["lft", "rgt"])
except TypeError: except TypeError:

7
erpnext/controllers/selling_controller.py
View File

@ -139,10 +139,11 @@ class SellingController(StockController):
def validate_max_discount(self): def validate_max_discount(self):
for d in self.get("items"): for d in self.get("items"):
discount = flt(frappe.get_cached_value("Item", d.item_code, "max_discount")) if d.item_code:
discount = flt(frappe.get_cached_value("Item", d.item_code, "max_discount"))
if discount and flt(d.discount_percentage) > discount: if discount and flt(d.discount_percentage) > discount:
frappe.throw(_("Maximum discount for Item {0} is {1}%").format(d.item_code, discount)) frappe.throw(_("Maximum discount for Item {0} is {1}%").format(d.item_code, discount))
def set_qty_as_per_stock_uom(self): def set_qty_as_per_stock_uom(self):
for d in self.get("items"): for d in self.get("items"):