mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-20 23:42:13 +00:00
fix: incorrect TCS on customer and suppliers with same name
(cherry picked from commit 9904a9868c)
This commit is contained in:
@@ -546,6 +546,7 @@ def get_tcs_amount(parties, inv, tax_details, vouchers, adv_vouchers):
|
|||||||
"GL Entry",
|
"GL Entry",
|
||||||
{
|
{
|
||||||
"is_cancelled": 0,
|
"is_cancelled": 0,
|
||||||
|
"party_type": "Customer",
|
||||||
"party": ["in", parties],
|
"party": ["in", parties],
|
||||||
"company": inv.company,
|
"company": inv.company,
|
||||||
"voucher_no": ["in", vouchers],
|
"voucher_no": ["in", vouchers],
|
||||||
@@ -560,6 +561,7 @@ def get_tcs_amount(parties, inv, tax_details, vouchers, adv_vouchers):
|
|||||||
conditions = []
|
conditions = []
|
||||||
conditions.append(ple.amount.lt(0))
|
conditions.append(ple.amount.lt(0))
|
||||||
conditions.append(ple.delinked == 0)
|
conditions.append(ple.delinked == 0)
|
||||||
|
conditions.append(ple.party_type == "Customer")
|
||||||
conditions.append(ple.party.isin(parties))
|
conditions.append(ple.party.isin(parties))
|
||||||
conditions.append(ple.voucher_no == ple.against_voucher_no)
|
conditions.append(ple.voucher_no == ple.against_voucher_no)
|
||||||
conditions.append(ple.company == inv.company)
|
conditions.append(ple.company == inv.company)
|
||||||
@@ -579,6 +581,7 @@ def get_tcs_amount(parties, inv, tax_details, vouchers, adv_vouchers):
|
|||||||
{
|
{
|
||||||
"is_cancelled": 0,
|
"is_cancelled": 0,
|
||||||
"credit": [">", 0],
|
"credit": [">", 0],
|
||||||
|
"party_type": "Customer",
|
||||||
"party": ["in", parties],
|
"party": ["in", parties],
|
||||||
"posting_date": ["between", (tax_details.from_date, tax_details.to_date)],
|
"posting_date": ["between", (tax_details.from_date, tax_details.to_date)],
|
||||||
"company": inv.company,
|
"company": inv.company,
|
||||||
|
|||||||
Reference in New Issue
Block a user