commit a88eaa6e206c21b9f5fd1cc6abbc1085e97e2269
author rohitwaghchaure <rohitw1991@gmail.com> Thu Nov 08 13:05:08 2018 +0530
committer Rushabh Mehta <rmehta@gmail.com> Thu Nov 08 13:05:08 2018 +0530
tree c9c9091e7c85dfec57b998ba464387d77a765d45
parent 6ff2f395f51696ebd6e2e40d2570d3af5092ddfd

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

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index eca4320..75db8b9 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -185,7 +185,8 @@
 				"discount_percentage": 0.0
 			})
 		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'):
 		item_details = remove_pricing_rule_for_item(args.get("pricing_rule"), item_details)