commit 46c97c6e9542fc42f0b7d059fbb8661782d5507a
author mbauskar <mbauskar@gmail.com> Tue Jan 19 19:51:11 2016 +0530
committer rohitwaghchaure <rohitw1991@gmail.com> Thu Mar 24 14:07:50 2016 +0530
tree 0357723a11048ab874dee2bb63fc9e4f1e6fa611
parent 5e76a1cffad48132af72b7f0c7982459d079af76

[fix] discount percentage fix

erpnext/controllers/accounts_controller.py

diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index dae1227..8e4b0a1 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -170,7 +170,10 @@
 								item.set(fieldname, value)
 
 					if ret.get("pricing_rule"):
-						item.set("discount_percentage", ret.get("discount_percentage"))
+						# if user changed the discount percentage then set user's discount percentage ?
+						discount_percentage = ret.get("discount_percentage") if item.get("discount_percentage") == \
+							ret.get("discount_percentage") else item.get("discount_percentage")
+						item.set("discount_percentage", discount_percentage)
 						if ret.get("pricing_rule_for") == "Price":
 							item.set("pricing_list_rate", ret.get("pricing_list_rate"))