From 0f3a02db57031bff992c7c5ae0c0f9cda39ea1fd Mon Sep 17 00:00:00 2001 From: Marica Date: Thu, 16 Jun 2022 12:23:13 +0530 Subject: [PATCH] fix: Merge Conflicts --- erpnext/accounts/doctype/pricing_rule/pricing_rule.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py index 1b216c61565..6ea244003c3 100644 --- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py @@ -36,12 +36,6 @@ class PricingRule(Document): self.margin_rate_or_amount = 0.0 def validate_duplicate_apply_on(self): -<<<<<<< HEAD - field = apply_on_dict.get(self.apply_on) - 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)) -======= if self.apply_on != "Transaction": apply_on_table = apply_on_dict.get(self.apply_on) if not apply_on_table: @@ -51,7 +45,6 @@ class PricingRule(Document): values = [d.get(apply_on_field) for d in self.get(apply_on_table) if d.get(apply_on_field)] if len(values) != len(set(values)): frappe.throw(_("Duplicate {0} found in the table").format(self.apply_on)) ->>>>>>> b4a93da9f3 (chore: Fix a potential variable misuse bug (#31372)) def validate_mandatory(self): for apply_on, field in apply_on_dict.items():