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

chore: resolve conflicts

Browse Source
This commit is contained in:
Smit Vora
2024-07-10 12:26:35 +05:30
parent 8264e3bc77
commit 23053f45de
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,13 +69,8 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_
tax_withholding_category = party_map.get(party, {}).get("tax_withholding_category") tax_withholding_category = party_map.get(party, {}).get("tax_withholding_category")
rate = tax_rate_map.get(tax_withholding_category) rate = tax_rate_map.get(tax_withholding_category)
<<<<<<< HEAD
if net_total_map.get(name):
if voucher_type == "Journal Entry":
=======
if net_total_map.get((voucher_type, name)): if net_total_map.get((voucher_type, name)):
if voucher_type == "Journal Entry" and tax_amount and rate: if voucher_type == "Journal Entry":
>>>>>>> 5c0d52f783 (fix(tds): use doctype reference when mapping keys across multiple doctypes (#42258))
# back calcalute total amount from rate and tax_amount # back calcalute total amount from rate and tax_amount
if rate: if rate:
total_amount = grand_total = base_total = tax_amount / (rate / 100) total_amount = grand_total = base_total = tax_amount / (rate / 100)