commit 8e2ce641c3d96d6c126e47bc9c691d8ff4671024
author marination <maricadsouza221197@gmail.com> Wed Oct 14 14:05:54 2020 +0530
committer Shivam Mishra <scm.mymail@gmail.com> Mon Nov 30 14:58:00 2020 +0530
tree 1c66649656d8eec4835d992e8c6e8e2a040f5e23
parent 58a3fea1b7229378713a1b1f95a9d84d71a9aeeb

fix: Dont overrule Item Price via Pricing Rule Rate if 0

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 149c476..55a5b0e 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -352,8 +352,14 @@
 		pricing_rule_rate = 0.0
 		if pricing_rule.currency == args.currency:
 			pricing_rule_rate = pricing_rule.rate
+
+		if pricing_rule_rate:
+			# Override already set price list rate (from item price)
+			# if pricing_rule_rate > 0
+			item_details.update({
+				"price_list_rate": pricing_rule_rate * args.get("conversion_factor", 1),
+			})
 		item_details.update({
-			"price_list_rate": pricing_rule_rate * args.get("conversion_factor", 1),
 			"discount_percentage": 0.0
 		})