nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 19:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] [minor] conversion rate related fixes

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-10-17 13:04:26 +05:30
parent 3add576b1e
commit acf65a7225
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/transaction.js
View File

@@ -48,7 +48,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
// remove this call when using client side mapper
me.set_default_values();
me.set_dynamic_labels();
me.calculate_taxes_and_totals()
me.calculate_taxes_and_totals();
}
});
} else {
@@ -171,7 +171,8 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
conversion_rate: function() {
if(this.frm.doc.currency === this.get_company_currency()) {
this.frm.set_value("conversion_rate", 1.0);
} else if(this.frm.doc.currency === this.frm.doc.price_list_currency &&
}
if(this.frm.doc.currency === this.frm.doc.price_list_currency &&
this.frm.doc.plc_conversion_rate !== this.frm.doc.conversion_rate) {
this.frm.set_value("plc_conversion_rate", this.frm.doc.conversion_rate);
}