commit 8bfe330b378e2d0d88d287715a876db8895d130d
author Rohit Waghchaure <rohitw1991@gmail.com> Mon Mar 18 14:34:19 2019 +0530
committer Rohit Waghchaure <rohitw1991@gmail.com> Tue Mar 19 12:44:30 2019 +0530
tree 00207cbbc29d74aaebc5473a0e810b7485a22c82
parent 5f8b358fd4746394cbe5c349b0e5bd1280c5af3a

feat: pricing rule enhancements

erpnext/public/js/controllers/buying.js

diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index a2a431d..3ec27fc 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -130,13 +130,23 @@
 		if (doc.doctype == "Purchase Order" && item.blanket_order_rate) {
 			item_rate = item.blanket_order_rate;
 		}
-		item.discount_amount = flt(item_rate) * flt(item.discount_percentage) / 100;
+
+		if (item.discount_percentage) {
+			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();
 	},
 
 	discount_percentage: function(doc, cdt, cdn) {
+		var item = frappe.get_doc(cdt, cdn);
+		item.discount_amount = 0.0;
+		this.price_list_rate(doc, cdt, cdn);
+	},
+
+	discount_amount: function(doc, cdt, cdn) {
 		this.price_list_rate(doc, cdt, cdn);
 	},