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

fix: Condition fix

Browse Source
This commit is contained in:
Deepesh Garg 2020-08-13 11:54:18 +05:30
parent cbde04d3da
commit ca898c6da3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ 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)
else: elif pricing_rule.condition:
try: try:
doc = doc.as_dict() doc = doc.as_dict()
return frappe.safe_eval(pricing_rule.condition, None, doc) return frappe.safe_eval(pricing_rule.condition, None, doc)