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

fix: condition syntax validation readded, fetch item details if condition not met ignoring rule

Browse Source
This commit is contained in:
Abhishek Balam 2020-08-13 13:22:58 +05:30
parent 487aa30aef
commit a25760046f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ class PricingRule(Document):
self.validate_max_discount() self.validate_max_discount()
self.validate_price_list_with_currency() self.validate_price_list_with_currency()
self.validate_dates() self.validate_dates()
validate_condition(self)
if not self.margin_type: self.margin_rate_or_amount = 0.0 if not self.margin_type: self.margin_rate_or_amount = 0.0
@ -144,13 +145,13 @@ class PricingRule(Document):
def validate_condition(pricing_rule, doc=None): def validate_condition(pricing_rule, doc=None):
if pricing_rule.condition and ("=" in pricing_rule.condition) and re.match("""[\w\.:_]+\s*={1}\s*[\w\.@'"]+""", pricing_rule.condition): if pricing_rule.condition and ("=" in pricing_rule.condition) and re.match("""[\w\.:_]+\s*={1}\s*[\w\.@'"]+""", pricing_rule.condition):
frappe.throw(_("Invalid condition in Pricing Rule: {0}").format(pricing_rule.name), frappe.ValidationError) frappe.throw(_("Invalid condition in Pricing Rule - {0}").format(pricing_rule.name), frappe.ValidationError)
elif pricing_rule.condition: elif doc:
try: try:
doc = doc.as_dict() return frappe.safe_eval(pricing_rule.condition, None, doc.as_dict())
return frappe.safe_eval(pricing_rule.condition, None, doc)
except Exception as e: except Exception as e:
frappe.throw(" Pricing Rule - " + pricing_rule.name + " - 'Condition' field error:<br>" + str(e).capitalize() ) frappe.msgprint(_("Pricing Rule - " + pricing_rule.name + " - <b>condition</b> field error:<br>" + \
str(e).capitalize() + "<br><br>Ignoring Pricing Rule"), indicator="orange", title=_("Warning"))
return False return False
return True return True
#-------------------------------------------------------------------------------- #--------------------------------------------------------------------------------