From dd82bf2ad9654cfd157a5e312b3c5d614f5a2264 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 11 May 2015 16:49:17 +0530 Subject: [PATCH] Exchange rate issue fixed --- erpnext/public/js/controllers/transaction.js | 3 ++- erpnext/stock/get_item_details.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 878c9ceca8..27500a52b4 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -219,7 +219,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ this.get_exchange_rate(this.frm.doc.currency, company_currency, function(exchange_rate) { me.frm.set_value("conversion_rate", exchange_rate); - me.conversion_rate(); }); } else { this.conversion_rate(); @@ -234,6 +233,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ this.frm.doc.plc_conversion_rate !== this.frm.doc.conversion_rate) { this.frm.set_value("plc_conversion_rate", this.frm.doc.conversion_rate); } + if(flt(this.frm.doc.conversion_rate)>0.0) { if(this.frm.doc.ignore_pricing_rule) { this.calculate_taxes_and_totals(); @@ -452,6 +452,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ "currency": me.frm.doc.currency, "conversion_rate": me.frm.doc.conversion_rate, "price_list": me.frm.doc.selling_price_list || me.frm.doc.buying_price_list, + "price_list_currency": me.frm.doc.price_list_currency, "plc_conversion_rate": me.frm.doc.plc_conversion_rate, "company": me.frm.doc.company, "transaction_date": me.frm.doc.transaction_date || me.frm.doc.posting_date, diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index e24f67a5e8..3c820fa583 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -402,9 +402,9 @@ def get_price_list_currency_and_exchange_rate(args): price_list_currency = get_price_list_currency(args.price_list) plc_conversion_rate = args.plc_conversion_rate - if (not plc_conversion_rate) or (price_list_currency != args.price_list_currency): - plc_conversion_rate = get_exchange_rate(price_list_currency, args.currency) \ - or plc_conversion_rate + if (not plc_conversion_rate) or (price_list_currency and args.price_list_currency \ + and price_list_currency != args.price_list_currency): + plc_conversion_rate = get_exchange_rate(price_list_currency, args.currency) or plc_conversion_rate return { "price_list_currency": price_list_currency,