From 619c40b04a1255f86ffc7f8f2ff0ea9d2beeca15 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 7 Nov 2016 15:29:17 +0530 Subject: [PATCH] [POS] Pricing rule discount issue --- erpnext/accounts/page/pos/pos.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index 4c13fe3720..32e9b3ab60 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -988,6 +988,10 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ item.margin_rate_or_amount = pricing_rule[0].margin_rate_or_amount; item.discount_percentage = pricing_rule[0].discount_percentage || 0.0; me.apply_pricing_rule_on_item(item) + } else if(item.discount_percentage > 0 || item.margin_rate_or_amount > 0) { + item.margin_rate_or_amount = 0.0; + item.discount_percentage = 0.0; + me.apply_pricing_rule_on_item(item) } }) },