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

[fix] [minor] conversion rate fix

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-10-17 11:31:11 +05:30
parent 61b5c59e70
commit 564c621c3e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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;
} }
@@ -46,6 +46,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
freeze: true, freeze: true,
callback: function(r) { callback: function(r) {
// remove this call when using client side mapper // remove this call when using client side mapper
me.frm.script_manager.trigger("company");
me.set_default_values(); me.set_default_values();
me.set_dynamic_labels(); me.set_dynamic_labels();
me.calculate_taxes_and_totals() me.calculate_taxes_and_totals()
@@ -226,7 +227,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();
} }