From fa932e2a3e238a8ba137187e493040151f9e40c7 Mon Sep 17 00:00:00 2001 From: Afshan Date: Mon, 8 Mar 2021 14:36:40 +0530 Subject: [PATCH 1/2] fix: sending proper arguments for report --- .../tds_computation_summary/tds_computation_summary.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py index c7cfee74cb..f60e409997 100644 --- a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +++ b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals import frappe from frappe import _ -from frappe.utils import flt +from frappe.utils import flt, getdate from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.doctype.tax_withholding_category.tax_withholding_category \ import get_advance_vouchers, get_debit_note_amount @@ -55,7 +55,7 @@ def get_result(filters): except IndexError: account = [] total_invoiced_amount, tds_deducted = get_invoice_and_tds_amount(supplier.name, account, - filters.company, filters.from_date, filters.to_date) + filters.company, filters.from_date, filters.to_date, filters.fiscal_year) if total_invoiced_amount or tds_deducted: row = [supplier.pan, supplier.name] @@ -68,7 +68,7 @@ def get_result(filters): return out -def get_invoice_and_tds_amount(supplier, account, company, from_date, to_date): +def get_invoice_and_tds_amount(supplier, account, company, from_date, to_date, fiscal_year): ''' calculate total invoice amount and total tds deducted for given supplier ''' entries = frappe.db.sql(""" @@ -94,7 +94,9 @@ def get_invoice_and_tds_amount(supplier, account, company, from_date, to_date): """.format(', '.join(["'%s'" % d for d in vouchers])), (account, from_date, to_date, company))[0][0]) - debit_note_amount = get_debit_note_amount([supplier], from_date, to_date, company=company) + date_range_filter = [fiscal_year, from_date, to_date] + + debit_note_amount = get_debit_note_amount([supplier], date_range_filter, company=company) total_invoiced_amount = supplier_credit_amount + tds_deducted - debit_note_amount From 1002e36c532243f490a6e282c7bb1dbce2495468 Mon Sep 17 00:00:00 2001 From: Afshan Date: Mon, 8 Mar 2021 14:39:19 +0530 Subject: [PATCH 2/2] fix: removed unused import --- .../report/tds_computation_summary/tds_computation_summary.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py index f60e409997..a8280c1b18 100644 --- a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py +++ b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals import frappe from frappe import _ -from frappe.utils import flt, getdate +from frappe.utils import flt from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.doctype.tax_withholding_category.tax_withholding_category \ import get_advance_vouchers, get_debit_note_amount