Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exchange rate issue fixed

Browse Source
This commit is contained in:
Nabin Hait 2015-05-11 16:49:17 +05:30
parent 3d77de9cf9
commit dd82bf2ad9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/public/js/controllers/transaction.js
View File

@ -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,

6
erpnext/stock/get_item_details.py
View File

@ -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,