commit a3f393918d744b0a5a8dfdb646c0318b54476804
author Nabin Hait <nabinhait@gmail.com> Thu Nov 03 15:13:03 2016 +0530
committer GitHub <noreply@github.com> Thu Nov 03 15:13:03 2016 +0530
tree 61aeb0f7e2e90104ba11ad2d3cb1b3ed13836b07
parent 9f5f53490095b779202b7b60974e665df8cf3805
parent 1ac67b873c7f13c9c0faa29c8ad8bf0df930bee0

Merge pull request #6807 from nabinhait/hotfix

[fix] Get data in opportunity dashboard

erpnext/public/js/controllers/taxes_and_totals.js

diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index aeceda4..4b14d08 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -5,9 +5,10 @@
 	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));