schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Merge Conflicts

Browse Source
This commit is contained in:
Marica
2022-06-16 12:23:13 +05:30
committed by GitHub
parent 2cd03196a4
commit 0f3a02db57
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,12 +36,6 @@ class PricingRule(Document):
self.margin_rate_or_amount = 0.0 self.margin_rate_or_amount = 0.0
def validate_duplicate_apply_on(self): 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": if self.apply_on != "Transaction":
apply_on_table = apply_on_dict.get(self.apply_on) apply_on_table = apply_on_dict.get(self.apply_on)
if not apply_on_table: 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)] 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)): if len(values) != len(set(values)):
frappe.throw(_("Duplicate {0} found in the table").format(self.apply_on)) 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): def validate_mandatory(self):
for apply_on, field in apply_on_dict.items(): for apply_on, field in apply_on_dict.items():