nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 21:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46814 from frappe/mergify/bp/version-15-hotfix/pr-46812

Browse Source 
fix: revert resetting `rounding_adjustment` (backport #46812)
This commit is contained in:
Sagar Vora
2025-03-31 15:56:08 +05:30
committed by GitHub
parent 7b864bece8 96af1ccffb
commit 62275d09da
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/taxes_and_totals.py
View File

@@ -643,7 +643,7 @@ class calculate_taxes_and_totals:
if self.doc.meta.get_field("rounded_total"): if self.doc.meta.get_field("rounded_total"):
if self.doc.is_rounded_total_disabled(): if self.doc.is_rounded_total_disabled():
self.doc.rounded_total = self.doc.base_rounded_total = self.doc.rounding_adjustment = 0 self.doc.rounded_total = self.doc.base_rounded_total = 0
return return
self.doc.rounded_total = round_based_on_smallest_currency_fraction( self.doc.rounded_total = round_based_on_smallest_currency_fraction(

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

@@ -343,6 +343,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
calculate_taxes() { calculate_taxes() {
var me = this; var me = this;
this.frm.doc.rounding_adjustment = 0;
var actual_tax_dict = {}; var actual_tax_dict = {};
// maintain actual tax rate based on idx // maintain actual tax rate based on idx
@@ -626,7 +627,6 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
if (cint(disable_rounded_total)) { if (cint(disable_rounded_total)) {
this.frm.doc.rounded_total = 0; this.frm.doc.rounded_total = 0;
this.frm.doc.base_rounded_total = 0; this.frm.doc.base_rounded_total = 0;
this.frm.doc.rounding_adjustment = 0;
return; return;
} }