nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2023-06-16 12:22:23 +05:30
committed by GitHub
parent a98a13b683
commit d49a8ad74f
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -518,17 +518,6 @@ 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(
"Purchase Invoice",
{
"supplier": ("in", parties),
"apply_tds": 1,
"docstatus": 1,
"posting_date": ("between", (ldc.valid_from, ldc.valid_upto)),
},
"sum(base_net_total)",
=======
limit_consumed = flt( limit_consumed = flt(
frappe.db.get_all( frappe.db.get_all(
@@ -542,7 +531,6 @@ def get_tds_amount_from_ldc(ldc, parties, pan_no, tax_details, posting_date, net
}, },
fields=["sum(base_net_total) as limit_consumed"], fields=["sum(base_net_total) as limit_consumed"],
)[0].get("limit_consumed") )[0].get("limit_consumed")
>>>>>>> 571c977e8e (fix: Incorrect field while calculating Tax withholding net total)
) )
if is_valid_certificate( if is_valid_certificate(