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

fix: Incorrect field while calculating Tax withholding net total

Browse Source 
(cherry picked from commit 571c977e8e)

# Conflicts:
#	erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
This commit is contained in:
Deepesh Garg
2023-06-16 12:17:31 +05:30
committed by Mergify
parent ac9f1fefe6
commit a98a13b683
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -518,6 +518,7 @@ def get_invoice_total_without_tcs(inv, tax_details):
def get_tds_amount_from_ldc(ldc, parties, pan_no, tax_details, posting_date, net_total): def get_tds_amount_from_ldc(ldc, parties, pan_no, tax_details, posting_date, net_total):
tds_amount = 0 tds_amount = 0
<<<<<<< HEAD
limit_consumed = frappe.db.get_value( limit_consumed = frappe.db.get_value(
"Purchase Invoice", "Purchase Invoice",
{ {
@@ -527,6 +528,21 @@ def get_tds_amount_from_ldc(ldc, parties, pan_no, tax_details, posting_date, net
"posting_date": ("between", (ldc.valid_from, ldc.valid_upto)), "posting_date": ("between", (ldc.valid_from, ldc.valid_upto)),
}, },
"sum(base_net_total)", "sum(base_net_total)",
=======
limit_consumed = flt(
frappe.db.get_all(
"Purchase Invoice",
filters={
"supplier": ("in", parties),
"apply_tds": 1,
"docstatus": 1,
"tax_withholding_category": ldc.tax_withholding_category,
"posting_date": ("between", (ldc.valid_from, ldc.valid_upto)),
},
fields=["sum(base_net_total) as limit_consumed"],
)[0].get("limit_consumed")
>>>>>>> 571c977e8e (fix: Incorrect field while calculating Tax withholding net total)
) )
if is_valid_certificate( if is_valid_certificate(