| commit | bbe83f9ad51092ad26a7b34063d53eeaf8a2904a | [log] [tgz] |
|---|---|---|
| author | Khushal Trivedi <khushal.t@indictranstech.com> | Tue Dec 03 11:55:00 2019 +0530 |
| committer | Khushal Trivedi <khushal.t@indictranstech.com> | Tue Dec 03 11:55:00 2019 +0530 |
| tree | 48e709bbe8f2989f0ac8a2cd0591cb1f734a92a2 | |
| parent | 738bfdce050677a8add6ab4d4a58ea5e6bb60ca7 [diff] | |
| parent | b4b90eaaf73571e7386a41f7d09b2a8e21baa735 [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))