CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-25 15:49:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ensure fresh grand_total_diff is used for each calculation

Browse Source 
(cherry picked from commit b3fdef8d19)
This commit is contained in:
Sagar Vora
2025-12-11 17:48:37 +05:30
committed by Mergify
parent 857ab70f4e
commit 2d198e698a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/controllers/taxes_and_totals.py
View File

@@ -378,6 +378,9 @@ class calculate_taxes_and_totals:
self._calculate() self._calculate()
def calculate_taxes(self): def calculate_taxes(self):
# reset value from earlier calculations
self.grand_total_diff = 0
doc = self.doc doc = self.doc
if not doc.get("taxes"): if not doc.get("taxes"):
return return
@@ -587,7 +590,7 @@ class calculate_taxes_and_totals:
self.grand_total_diff = 0 self.grand_total_diff = 0
def calculate_totals(self): def calculate_totals(self):
grand_total_diff = getattr(self, "grand_total_diff", 0) grand_total_diff = self.grand_total_diff
if self.doc.get("taxes"): if self.doc.get("taxes"):
self.doc.grand_total = flt(self.doc.get("taxes")[-1].total) + grand_total_diff self.doc.grand_total = flt(self.doc.get("taxes")[-1].total) + grand_total_diff

7
erpnext/public/js/controllers/taxes_and_totals.js
View File

@@ -343,6 +343,9 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
} }
calculate_taxes() { calculate_taxes() {
// reset value from earlier calculations
this.grand_total_diff = 0;
const doc = this.frm.doc; const doc = this.frm.doc;
if (!doc.taxes?.length) return; if (!doc.taxes?.length) return;
@@ -578,6 +581,8 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
if ( diff && Math.abs(diff) <= (5.0 / Math.pow(10, precision("tax_amount", last_tax))) ) { if ( diff && Math.abs(diff) <= (5.0 / Math.pow(10, precision("tax_amount", last_tax))) ) {
me.grand_total_diff = diff; me.grand_total_diff = diff;
} else {
me.grand_total_diff = 0;
} }
} }
} }
@@ -587,7 +592,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
// Changing sequence can cause rounding_adjustmentng issue and on-screen discrepency // Changing sequence can cause rounding_adjustmentng issue and on-screen discrepency
const me = this; const me = this;
const tax_count = this.frm.doc.taxes?.length; const tax_count = this.frm.doc.taxes?.length;
const grand_total_diff = this.grand_total_diff || 0; const grand_total_diff = this.grand_total_diff;
this.frm.doc.grand_total = flt(tax_count this.frm.doc.grand_total = flt(tax_count
? this.frm.doc["taxes"][tax_count - 1].total + grand_total_diff ? this.frm.doc["taxes"][tax_count - 1].total + grand_total_diff