From 47749f4635b2652ed0b5821bdca20a1e71566918 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 12 Dec 2017 14:16:03 +0530 Subject: [PATCH] [fix] Cur_frm breaking offline pos (#11955) --- erpnext/public/js/controllers/taxes_and_totals.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index 1601ba28cc..6a08dbf3ec 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -10,7 +10,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ + flt(item.price_list_rate) * ( flt(item.margin_rate_or_amount) / 100); } else { item.rate_with_margin = flt(item.price_list_rate) + flt(item.margin_rate_or_amount); - item.base_rate_with_margin = flt(item.rate_with_margin) * flt(cur_frm.doc.conversion_rate); + item.base_rate_with_margin = flt(item.rate_with_margin) * flt(this.frm.doc.conversion_rate); } item.rate = flt(item.rate_with_margin , precision("rate", item));