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

fix: include grand_total in journal entry and handle taxes correctly in invoice total calculation

Browse Source
This commit is contained in:
ljain112
2025-10-09 13:44:32 +05:30
parent 2112f36577
commit 88f6d783b4
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -409,6 +409,7 @@ class JournalEntry(AccountsController):
"posting_date": self.posting_date, "posting_date": self.posting_date,
"tax_withholding_net_total": net_total, "tax_withholding_net_total": net_total,
"base_tax_withholding_net_total": net_total, "base_tax_withholding_net_total": net_total,
"grand_total": net_total,
} }
) )

2
erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
View File

@@ -724,7 +724,7 @@ def get_advance_adjusted_in_invoice(inv):
def get_invoice_total_without_tcs(inv, tax_details): def get_invoice_total_without_tcs(inv, tax_details):
tcs_tax_row = [d for d in inv.taxes if d.account_head == tax_details.account_head] tcs_tax_row = [d for d in inv.get("taxes") or [] if d.account_head == tax_details.account_head]
tcs_tax_row_amount = tcs_tax_row[0].base_tax_amount if tcs_tax_row else 0 tcs_tax_row_amount = tcs_tax_row[0].base_tax_amount if tcs_tax_row else 0
return inv.grand_total - tcs_tax_row_amount return inv.grand_total - tcs_tax_row_amount