From 1067f7ed3ea1b7c402c8a8dc9867da1ce0fd1485 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 17 Aug 2020 23:47:58 +0530 Subject: [PATCH] fix: Price rule filtering in case of no doc --- erpnext/accounts/doctype/pricing_rule/pricing_rule.py | 2 +- erpnext/accounts/doctype/pricing_rule/utils.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py index 611c2fca69..5a93006184 100644 --- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py @@ -145,7 +145,7 @@ class PricingRule(Document): def validate_condition(self): if self.condition and ("=" in self.condition) and re.match("""[\w\.:_]+\s*={1}\s*[\w\.@'"]+""", self.condition): - frappe.throw(_("Invalid condition in Pricing Rule - {0}").format(pricing_rule.name), frappe.ValidationError) + frappe.throw(_("Invalid condition expression")) #-------------------------------------------------------------------------------- diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py index 59903a70b6..fab533ebd2 100644 --- a/erpnext/accounts/doctype/pricing_rule/utils.py +++ b/erpnext/accounts/doctype/pricing_rule/utils.py @@ -66,6 +66,8 @@ def filter_pricing_rule_based_on_condition(pricing_rules, doc=None): str(e).capitalize() + "

Ignoring Pricing Rule"), indicator="orange", title=_("Warning")) else: filtered_pricing_rules.append(pricing_rule) + else: + filtered_pricing_rules = pricing_rules return filtered_pricing_rules