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

fix: calculate net_total excluding taxes

Browse Source
This commit is contained in:
ljain112
2025-10-09 13:08:55 +05:30
parent 84e6d278c3
commit 004bd59245
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@@ -353,6 +353,7 @@ class JournalEntry(AccountsController):
) )
def apply_tax_withholding(self): def apply_tax_withholding(self):
from erpnext.accounts.report.general_ledger.general_ledger import get_account_type_map
from erpnext.setup.utils import get_exchange_rate from erpnext.setup.utils import get_exchange_rate
if not self.apply_tds or self.voucher_type not in ("Debit Note", "Credit Note"): if not self.apply_tds or self.voucher_type not in ("Debit Note", "Credit Note"):
@@ -361,6 +362,7 @@ class JournalEntry(AccountsController):
party = None party = None
party_type = None party_type = None
party_row = None party_row = None
party_account = None
for row in self.get("accounts"): for row in self.get("accounts"):
if row.party_type in ("Customer", "Supplier") and row.party: if row.party_type in ("Customer", "Supplier") and row.party:
@@ -370,6 +372,7 @@ class JournalEntry(AccountsController):
if not party: if not party:
party = row.party party = row.party
party_type = row.party_type party_type = row.party_type
party_account = row.account
party_row = row party_row = row
if not party: if not party:
@@ -381,12 +384,14 @@ class JournalEntry(AccountsController):
precision = self.precision(dr_cr, party_row) precision = self.precision(dr_cr, party_row)
account_type_map = get_account_type_map(self.company)
# net total in company currency. # net total in company currency.
net_total = flt( net_total = flt(
sum( sum(
d.get(dr_cr) - d.get(rev_dr_cr) d.get(rev_dr_cr) - d.get(dr_cr)
for d in self.get("accounts") for d in self.get("accounts")
if d.party == party and d.party_type == party_type if account_type_map.get(d.account) not in ("Tax", "Chargeable") and d.account != party_account
), ),
precision, precision,
) )