Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Filter out bank payment entries

Browse Source
This commit is contained in:
Deepesh Garg 2022-02-14 20:38:04 +05:30
parent 2ff6b3560e
commit 04cbde2e52
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
View File

@ -184,7 +184,8 @@ def get_tds_docs(filters):
payment_entries = [] payment_entries = []
journal_entries = [] journal_entries = []
tax_category_map = {} tax_category_map = {}
or_filters={} or_filters = {}
bank_accounts = frappe.get_all('Account', {'is_group': 0, 'account_type': 'Bank'}, pluck="name")
tds_accounts = frappe.get_all("Tax Withholding Account", {'company': filters.get('company')}, tds_accounts = frappe.get_all("Tax Withholding Account", {'company': filters.get('company')},
pluck="account") pluck="account")
@ -192,11 +193,13 @@ def get_tds_docs(filters):
query_filters = { query_filters = {
"account": ("in", tds_accounts), "account": ("in", tds_accounts),
"posting_date": ("between", [filters.get("from_date"), filters.get("to_date")]), "posting_date": ("between", [filters.get("from_date"), filters.get("to_date")]),
"is_cancelled": 0 "is_cancelled": 0,
"against": ("not in", bank_accounts)
} }
if filters.get("supplier"): if filters.get("supplier"):
del query_filters["account"] del query_filters["account"]
del query_filters["against"]
or_filters = { or_filters = {
"against": filters.get('supplier'), "against": filters.get('supplier'),
"party": filters.get('supplier') "party": filters.get('supplier')