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

[Fix] User able to change discount if pricing rule has discount value as zero (#15921)

Browse Source
This commit is contained in:
rohitwaghchaure 2018-11-08 13:05:08 +05:30 committed by Rushabh Mehta
parent 6ff2f395f5
commit a88eaa6e20
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,7 +185,8 @@ def get_pricing_rule_for_item(args):
"discount_percentage": 0.0 "discount_percentage": 0.0
}) })
else: else:
item_details.discount_percentage = pricing_rule.discount_percentage or args.discount_percentage item_details.discount_percentage = (pricing_rule.get('discount_percentage', 0)
if pricing_rule else args.discount_percentage)
elif args.get('pricing_rule'): elif args.get('pricing_rule'):
item_details = remove_pricing_rule_for_item(args.get("pricing_rule"), item_details) item_details = remove_pricing_rule_for_item(args.get("pricing_rule"), item_details)