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/selling/sales_common.js

diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index a246822..965d2b0 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -140,8 +140,18 @@
 
 	discount_percentage: function(doc, cdt, cdn) {
 		var item = frappe.get_doc(cdt, cdn);
+		item.discount_amount = 0.0;
+		this.apply_discount_on_item(doc, cdt, cdn, 'discount_percentage');
+	},
+
+	discount_amount: function(doc, cdt, cdn) {
+		this.apply_discount_on_item(doc, cdt, cdn, 'discount_amount');
+	},
+
+	apply_discount_on_item: function(doc, cdt, cdn, field) {
+		var item = frappe.get_doc(cdt, cdn);
 		if(!item.price_list_rate) {
-			item.discount_percentage = 0.0;
+			item[field] = 0.0;
 		} else {
 			this.price_list_rate(doc, cdt, cdn);
 		}