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

enhancement(tds-monthly-payable): remove zero value transaction (#19141)

Browse Source
This commit is contained in:
Mangesh-Khairnar 2019-09-24 19:46:06 +05:30 committed by Nabin Hait
parent c6b548b5b2
commit 1e6e1dd451
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.json
View File

@ -1,6 +1,7 @@
{ {
"add_total_row": 0, "add_total_row": 1,
"creation": "2018-08-21 11:32:30.874923", "creation": "2018-08-21 11:32:30.874923",
"disable_prepared_report": 0,
"disabled": 0, "disabled": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "Report", "doctype": "Report",

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

@ -70,7 +70,7 @@ def get_result(filters):
rate = [i.tax_withholding_rate for i in tds_doc.rates rate = [i.tax_withholding_rate for i in tds_doc.rates
if i.fiscal_year == gle_map[d][0].fiscal_year] if i.fiscal_year == gle_map[d][0].fiscal_year]
if rate and len(rate) > 0: if rate and len(rate) > 0 and tds_deducted:
rate = rate[0] rate = rate[0]
if getdate(filters.from_date) <= gle_map[d][0].posting_date \ if getdate(filters.from_date) <= gle_map[d][0].posting_date \
@ -164,7 +164,7 @@ def get_columns(filters):
{ {
"label": _("TDS Rate %"), "label": _("TDS Rate %"),
"fieldname": "tds_rate", "fieldname": "tds_rate",
"fieldtype": "Float", "fieldtype": "Percent",
"width": 90 "width": 90
}, },
{ {