Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(pricing_rule): apply_on logic dont get cleanup

Browse Source 
(cherry picked from commit acf399c4e0c74458c17866be7d72788aeecbe829)
This commit is contained in:
Poranut Chollavorn 2020-06-18 14:41:26 +00:00 committed by mergify-bot
parent 5dc175f068
commit e3973a4730
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,9 +80,15 @@ class PricingRule(Document):
for f in options:
if not f: continue
f = frappe.scrub(f)
if f!=fieldname:
self.set(f, None)
scrubbed_f = frappe.scrub(f)
if logic_field == 'apply_on':
apply_on_f = apply_on_dict.get(f, f)
else:
apply_on_f = scrubbed_f
if scrubbed_f != fieldname:
self.set(apply_on_f, None)
if self.mixed_conditions and self.get("same_item"):
self.same_item = 0