From 516ad9021b4ea102f2571da49c7bb2793a24f13f Mon Sep 17 00:00:00 2001 From: Luis Mendoza Date: Wed, 18 Feb 2026 16:44:56 +0000 Subject: [PATCH] fix(accounts): round and convert net_amount to company currency in JS tax controller (cherry picked from commit b10b20539471879da0fcaf64648cf22d598b7f82) # Conflicts: # erpnext/public/js/controllers/taxes_and_totals.js --- erpnext/public/js/controllers/taxes_and_totals.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index 35f2b90f695..5f069539754 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -382,6 +382,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { ); if (frappe.flags.round_row_wise_tax) { current_tax_amount = flt(current_tax_amount, precision("tax_amount", tax)); + current_net_amount = flt(current_net_amount, precision("net_amount", tax)); } // Adjust divisional loss to the last item @@ -447,8 +448,12 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments { for (const [i, tax] of doc.taxes.entries()) { me.round_off_totals(tax); +<<<<<<< HEAD me.set_in_company_currency(tax, ["tax_amount", "tax_amount_after_discount_amount"]); +======= + me.set_in_company_currency(tax, ["tax_amount", "tax_amount_after_discount_amount", "net_amount"]); +>>>>>>> b10b205394 (fix(accounts): round and convert net_amount to company currency in JS tax controller) me.round_off_base_values(tax);