From 9f5f53490095b779202b7b60974e665df8cf3805 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 3 Nov 2016 14:46:13 +0530 Subject: [PATCH] set item rate on first selection of item --- erpnext/public/js/controllers/taxes_and_totals.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index aeceda4982d..4b14d08edad 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -5,9 +5,10 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ setup: function() {}, apply_pricing_rule_on_item: function(item){ if(item.margin_type == "Percentage"){ - item.total_margin = item.price_list_rate + item.price_list_rate * ( item.margin_rate_or_amount / 100); + item.total_margin = flt(item.price_list_rate) + + flt(item.price_list_rate) * ( flt(item.margin_rate_or_amount) / 100); }else{ - item.total_margin = item.price_list_rate + item.margin_rate_or_amount; + item.total_margin = flt(item.price_list_rate) + flt(item.margin_rate_or_amount); } item.rate = flt(item.total_margin , precision("rate", item));