commit a804d6d48786ed1ea0eece8d3f63a3f1d1ac22f5
author Nabin Hait <nabinhait@gmail.com> Wed Aug 29 13:34:58 2018 +0530
committer Nabin Hait <nabinhait@gmail.com> Wed Aug 29 13:34:58 2018 +0530
tree a5e7166692bde694e6e83c0f367f17801a97291c
parent 6b539d65d7f6c637a45619a09ec667ef70cbda23
parent d982e8fcdaf384f83b5c1c5c135ac252db5d052d

Fixed merge conflict

erpnext/public/js/controllers/buying.js

diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 0ecf6e1..55fcaab 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -119,7 +119,8 @@
 		if (doc.doctype == "Purchase Order" && item.blanket_order_rate) {
 			item_rate = item.blanket_order_rate;
 		}
-		item.rate = flt(item_rate * (1 - item.discount_percentage / 100.0), precision("rate", item));
+		item.discount_amount = flt(item_rate) * flt(item.discount_percentage) / 100;		
+		item.rate = flt((item.price_list_rate) - (item.discount_amount), precision('rate', item));
 
 		this.calculate_taxes_and_totals();
 	},