From 8e675ebbe29d574333db18e5aa07a44b8b6f82cb Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 13 Feb 2018 17:11:06 +0530 Subject: [PATCH] [Fix] Price list exchange rate is not visible when base currency and price list currency is different (#12898) --- erpnext/public/js/controllers/transaction.js | 3 ++- erpnext/selling/sales_common.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index a56ebd2e75..eae5283d32 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -776,7 +776,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ this.frm.toggle_reqd("plc_conversion_rate", !!(this.frm.doc.price_list_name && this.frm.doc.price_list_currency)); - if(this.frm.doc_currency!==this.frm.doc.currency) { + if(this.frm.doc_currency!==this.frm.doc.currency + || this.frm.doc_currency!==this.frm.doc.price_list_currency) { // reset names only when the currency is different var company_currency = this.get_company_currency(); diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js index 5ca26181e3..aa5b3ba498 100644 --- a/erpnext/selling/sales_common.js +++ b/erpnext/selling/sales_common.js @@ -118,6 +118,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ selling_price_list: function() { this.apply_price_list(); + this.set_dynamic_labels(); }, price_list_rate: function(doc, cdt, cdn) {