nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-15 07:28:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55899 from nabinhait/fix/margin-currency-rate-refresh

Browse Source 
fix: don't convert item margin on exchange rate refresh
This commit is contained in:
Nabin Hait
2026-06-19 12:42:21 +05:30
committed by GitHub
parent dfd0c85ba4 6f9a8ff101
commit 817c5007d9
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -602,6 +602,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
refresh() {
erpnext.toggle_naming_series();
erpnext.hide_company(this.frm);
// Remember the currency the rendered document is denominated in, so that a
// real currency change can be told apart from a mere exchange rate refresh
// (e.g. triggered by a date change).
this._doc_currency = this.frm.doc.currency;
this.set_dynamic_labels();
this.setup_sms();
this.setup_quality_inspection();
@@ -1472,6 +1476,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
let me = this;
this.set_dynamic_labels();
let company_currency = this.get_company_currency();
// Currency the stored margins/actual charges are denominated in, captured
// before this trigger updates the tracker for the next one.
let previous_currency = this._doc_currency;
this._doc_currency = this.frm.doc.currency;
// Added `load_after_mapping` to determine if document is loading after mapping from another doc
if (
this.frm.doc.currency &&
@@ -1484,8 +1492,14 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
company_currency,
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);
// Margins and actual charges are amounts in the transaction
// currency; convert them only when the currency itself changed,
// not when just the exchange rate was refreshed (e.g. by a date
// change), otherwise the entered margin keeps shrinking.
if (previous_currency !== me.frm.doc.currency) {
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);
}
}

20
erpnext/selling/doctype/quotation/quotation.js
View File

@@ -382,26 +382,6 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
dialog.show();
}
currency() {
super.currency();
let me = this;
const company_currency = this.get_company_currency();
if (this.frm.doc.currency && this.frm.doc.currency !== company_currency) {
this.get_exchange_rate(
this.frm.doc.transaction_date,
this.frm.doc.currency,
company_currency,
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);
}
}
);
}
}
disable_customer_if_creating_from_opportunity(doc) {
if (doc.opportunity) {
this.frm.set_df_property("party_name", "read_only", 1);