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

fix: On change of currency, set margin amount based on exchange rate (#17712)

Browse Source
This commit is contained in:
Nabin Hait 2019-05-27 17:15:47 +05:30 committed by GitHub
parent a8f6938556
commit aafd64d9b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -756,7 +756,11 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
this.get_exchange_rate(transaction_date, this.frm.doc.currency, company_currency, this.get_exchange_rate(transaction_date, this.frm.doc.currency, company_currency,
function(exchange_rate) { function(exchange_rate) {
if(exchange_rate != me.frm.doc.conversion_rate) {
me.set_margin_amount_based_on_currency(exchange_rate);
me.set_actual_charges_based_on_currency(exchange_rate);
me.frm.set_value("conversion_rate", exchange_rate); me.frm.set_value("conversion_rate", exchange_rate);
}
}); });
} else { } else {
this.conversion_rate(); this.conversion_rate();
@ -777,7 +781,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(this.frm.doc.ignore_pricing_rule) { if(this.frm.doc.ignore_pricing_rule) {
this.calculate_taxes_and_totals(); this.calculate_taxes_and_totals();
} else if (!this.in_apply_price_list){ } else if (!this.in_apply_price_list){
this.set_actual_charges_based_on_currency();
this.apply_price_list(); this.apply_price_list();
} }
@ -804,12 +807,24 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
} }
}, },
set_actual_charges_based_on_currency: function() { set_margin_amount_based_on_currency: function(exchange_rate) {
if (in_list(["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]), this.frm.doc.doctype) {
var me = this;
$.each(this.frm.doc.items || [], function(i, d) {
if(d.margin_type == "Amount") {
frappe.model.set_value(d.doctype, d.name, "margin_rate_or_amount",
flt(d.margin_rate_or_amount) / flt(exchange_rate));
}
});
}
},
set_actual_charges_based_on_currency: function(exchange_rate) {
var me = this; var me = this;
$.each(this.frm.doc.taxes || [], function(i, d) { $.each(this.frm.doc.taxes || [], function(i, d) {
if(d.charge_type == "Actual") { if(d.charge_type == "Actual") {
frappe.model.set_value(d.doctype, d.name, "tax_amount", frappe.model.set_value(d.doctype, d.name, "tax_amount",
flt(d.tax_amount) / flt(me.frm.doc.conversion_rate)); flt(d.tax_amount) / flt(exchange_rate));
} }
}); });
}, },