schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Do not add tax withheld vouchers post tax withheding in one document

Browse Source 
(cherry picked from commit 781d160c68)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
(cherry picked from commit e1c41b9195)
This commit is contained in:
Deepesh Garg
2022-10-07 14:22:40 +05:30
committed by Mergify
parent 6e9b52d268
commit be404b77a1
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@@ -1428,6 +1428,7 @@
"fieldname": "tax_withheld_vouchers",
"fieldtype": "Table",
"label": "Tax Withheld Vouchers",
"no_copy": 1,
"options": "Tax Withheld Vouchers",
"read_only": 1
}
@@ -1436,7 +1437,11 @@
"idx": 204,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2022-09-13 23:39:54.525037",
=======
"modified": "2022-10-07 14:19:14.214157",
>>>>>>> 781d160c68 (fix: Do not add tax withheld vouchers post tax withheding in one document)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",

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

@@ -240,6 +240,9 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
)
else:
tax_amount = net_total * tax_details.rate / 100 if net_total > 0 else 0
# once tds is deducted, not need to add vouchers in the invoice
voucher_wise_amount = {}
else:
tax_amount = get_tds_amount(ldc, parties, inv, tax_details, tax_deducted, vouchers)