CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-10 22:06:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52029 from ljain112/fix-inclusive-discount

Browse Source
This commit is contained in:
Diptanil Saha
2026-02-24 16:58:12 +05:30
committed by GitHub
parent dd910bb4cc 2068299766
commit 9541cb226d
3 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/controllers/taxes_and_totals.py
View File

@@ -671,6 +671,11 @@ class calculate_taxes_and_totals:
else:
self.grand_total_diff = 0
# Apply rounding adjustment to grand_total_for_distributing_discount
# to prevent precision errors during discount distribution
if hasattr(self, "grand_total_for_distributing_discount") and not self.discount_amount_applied:
self.grand_total_for_distributing_discount += self.grand_total_diff
def calculate_totals(self):
grand_total_diff = self.grand_total_diff

38
erpnext/controllers/tests/test_distributed_discount.py
View File

@@ -59,3 +59,41 @@ class TestTaxesAndTotals(AccountsTestMixin, IntegrationTestCase):
self.assertEqual(so.total, 1500)
self.assertAlmostEqual(so.net_total, 1272.73, places=2)
self.assertEqual(so.grand_total, 1400)
def test_100_percent_discount_with_inclusive_tax(self):
"""Test that 100% discount with inclusive taxes results in zero net_total"""
so = make_sales_order(do_not_save=1)
so.apply_discount_on = "Grand Total"
so.items[0].qty = 2
so.items[0].rate = 1300
so.append(
"taxes",
{
"charge_type": "On Net Total",
"account_head": "_Test Account VAT - _TC",
"cost_center": "_Test Cost Center - _TC",
"description": "Account VAT",
"included_in_print_rate": True,
"rate": 9,
},
)
so.append(
"taxes",
{
"charge_type": "On Net Total",
"account_head": "_Test Account Service Tax - _TC",
"cost_center": "_Test Cost Center - _TC",
"description": "Account Service Tax",
"included_in_print_rate": True,
"rate": 9,
},
)
so.save()
# Apply 100% discount
so.discount_amount = 2600
calculate_taxes_and_totals(so)
# net_total should be exactly 0, not 0.01
self.assertEqual(so.net_total, 0)
self.assertEqual(so.grand_total, 0)

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

@@ -623,6 +623,12 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
} else {
me.grand_total_diff = 0;
}
// Apply rounding adjustment to grand_total_for_distributing_discount
// to prevent precision errors during discount distribution
if (me.grand_total_for_distributing_discount && !me.discount_amount_applied) {
me.grand_total_for_distributing_discount += me.grand_total_diff;
}
}
}
}