| commit | 738bfdce050677a8add6ab4d4a58ea5e6bb60ca7 | [log] [tgz] |
|---|---|---|
| author | Khushal Trivedi <khushal.t@indictranstech.com> | Mon Dec 02 17:37:45 2019 +0530 |
| committer | Khushal Trivedi <khushal.t@indictranstech.com> | Mon Dec 02 17:37:45 2019 +0530 |
| tree | 636d756bff8760759aa9532cd5349921c002aafc | |
| parent | db8911b05d79c98b10d1ff6b0dd723216961dc3d [diff] | |
| parent | de5237fbd50748f1c9e019a677cc800d5d1b321c [diff] |
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py index 430dce7..e871d98 100644 --- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -34,8 +34,7 @@ def validate_duplicate_apply_on(self): field = apply_on_dict.get(self.apply_on) - values = [d.get(frappe.scrub(self.apply_on)) for d in self.get(field)] - + values = [d.get(frappe.scrub(self.apply_on)) for d in self.get(field) if field] if len(values) != len(set(values)): frappe.throw(_("Duplicate {0} found in the table").format(self.apply_on))