From 258faab761d62674a1342e0a459305d9175c69ad Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Wed, 16 Aug 2017 08:46:46 +0100 Subject: [PATCH] Transaction Forms (Payment Entry, Sales Invoice, Purchase Invoice) can forget company currency (#10409) (#10410) * properly keep track of document currency and company currency * Update taxes_and_totals.js --- erpnext/public/js/controllers/taxes_and_totals.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index c653640de65..d042bb7220a 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -62,7 +62,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ this.frm.doc.conversion_rate = flt(this.frm.doc.conversion_rate, (cur_frm) ? precision("conversion_rate") : 9); var conversion_rate_label = frappe.meta.get_label(this.frm.doc.doctype, "conversion_rate", this.frm.doc.name); - var company_currency = this.frm.doc.currency || this.get_company_currency(); + var company_currency = this.get_company_currency(); if(!this.frm.doc.conversion_rate) { if(this.frm.doc.currency == company_currency) { @@ -419,7 +419,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ this.frm.doc.currency, precision("rounded_total")); } if(frappe.meta.get_docfield(this.frm.doc.doctype, "base_rounded_total", this.frm.doc.name)) { - var company_currency = this.frm.doc.currency || this.get_company_currency(); + var company_currency = this.get_company_currency(); this.frm.doc.base_rounded_total = round_based_on_smallest_currency_fraction(this.frm.doc.base_grand_total,