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

fix: back calcalute total amount from rate and tax_amount in tax withholding details report

Browse Source 
(cherry picked from commit d3751d9bb4)
This commit is contained in:
ljain112
2025-11-12 18:41:20 +05:30
committed by Mergify
parent 9b06eaab78
commit 57282999ad
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
View File

@@ -72,17 +72,28 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_
tax_withholding_category = party_map.get(party, {}).get("tax_withholding_category")
rate = get_tax_withholding_rates(tax_rate_map.get(tax_withholding_category, []), posting_date)
if net_total_map.get((voucher_type, name)):
values = net_total_map.get((voucher_type, name))
if values:
if voucher_type == "Journal Entry" and tax_amount and rate:
# back calcalute total amount from rate and tax_amount
base_total = min(tax_amount / (rate / 100), net_total_map.get((voucher_type, name))[0])
base_total = min(tax_amount / (rate / 100), values[0])
total_amount = grand_total = base_total
elif voucher_type == "Purchase Invoice":
total_amount, grand_total, base_total, bill_no, bill_date = net_total_map.get(
(voucher_type, name)
)
else:
total_amount, grand_total, base_total = net_total_map.get((voucher_type, name))
if tax_amount and rate:
# back calcalute total amount from rate and tax_amount
total_amount = (tax_amount * 100) / rate
else:
total_amount = values[0]
grand_total = values[1]
base_total = values[2]
if voucher_type == "Purchase Invoice":
bill_no = values[3]
bill_date = values[4]
else:
total_amount += entry.credit