nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #972 from akhileshdarjee/master

Browse Source 
[fix] [minor] conversion rater
This commit is contained in:
Rushabh Mehta
2013-10-16 23:03:41 -07:00
parent 940e893834 3add576b1e
commit be7e8556b0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/transaction.js
View File

@@ -26,7 +26,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
me.frm.set_value(fieldname, value); me.frm.set_value(fieldname, value);
}); });
} }
if(this.other_fname) { if(this.other_fname) {
this[this.other_fname + "_remove"] = this.calculate_taxes_and_totals; this[this.other_fname + "_remove"] = this.calculate_taxes_and_totals;
} }
@@ -225,7 +225,8 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
plc_conversion_rate: function() { 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) { }
if(this.frm.doc.price_list_currency === this.frm.doc.currency) {
this.frm.set_value("conversion_rate", this.frm.doc.plc_conversion_rate); this.frm.set_value("conversion_rate", this.frm.doc.plc_conversion_rate);
this.calculate_taxes_and_totals(); this.calculate_taxes_and_totals();
} }