nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 03:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

exchange rate fix

Browse Source
This commit is contained in:
Nabin Hait
2015-05-11 18:14:45 +05:30
parent dd82bf2ad9
commit ec361ea648
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,22 +260,29 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
price_list_currency: function() { price_list_currency: function() {
var me=this; var me=this;
this.set_dynamic_labels(); this.set_dynamic_labels();
this.set_plc_conversion_rate();
var company_currency = this.get_company_currency();
// Added `ignore_pricing_rule` to determine if document is loading after mapping from another doc
if(this.frm.doc.price_list_currency !== company_currency && !this.frm.doc.ignore_pricing_rule) {
this.get_exchange_rate(this.frm.doc.price_list_currency, company_currency,
function(exchange_rate) {
me.frm.set_value("plc_conversion_rate", exchange_rate);
});
} else {
this.plc_conversion_rate();
}
}, },
plc_conversion_rate: function() { plc_conversion_rate: function() {
this.set_plc_conversion_rate();
if(!this.in_apply_price_list) {
this.apply_price_list();
}
},
set_plc_conversion_rate: function() {
if(this.frm.doc.price_list_currency === this.get_company_currency()) { if(this.frm.doc.price_list_currency === this.get_company_currency()) {
this.frm.set_value("plc_conversion_rate", 1.0); this.frm.set_value("plc_conversion_rate", 1.0);
} else if(this.frm.doc.price_list_currency === this.frm.doc.currency && this.frm.doc.plc_conversion_rate && cint(this.frm.doc.plc_conversion_rate) != 1 &&
cint(this.frm.doc.plc_conversion_rate) != cint(this.frm.doc.conversion_rate)) {
this.frm.set_value("conversion_rate", this.frm.doc.plc_conversion_rate);
} }
if(this.frm.doc.price_list_currency === this.frm.doc.currency) {
this.frm.set_value("conversion_rate", this.frm.doc.plc_conversion_rate); if(!this.in_apply_price_list) {
this.apply_price_list();
} }
}, },