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

fix: fix filters for the report (#24594)

Browse Source
This commit is contained in:
Anuja Pawar 2021-02-11 11:06:12 +05:30 committed by GitHub
parent 8609d31430
commit e3c72a3d71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/regional/report/irs_1099/irs_1099.py
View File

@ -32,6 +32,10 @@ def execute(filters=None):
data = [] data = []
columns = get_columns() columns = get_columns()
conditions = ""
if filters.supplier_group:
conditions += "AND s.supplier_group = %s" %frappe.db.escape(filters.get("supplier_group"))
data = frappe.db.sql(""" data = frappe.db.sql("""
SELECT SELECT
s.supplier_group as "supplier_group", s.supplier_group as "supplier_group",
@ -46,13 +50,15 @@ def execute(filters=None):
AND s.irs_1099 = 1 AND s.irs_1099 = 1
AND gl.fiscal_year = %(fiscal_year)s AND gl.fiscal_year = %(fiscal_year)s
AND gl.party_type = "Supplier" AND gl.party_type = "Supplier"
AND gl.company = %(company)s
{conditions}
GROUP BY GROUP BY
gl.party gl.party
ORDER BY ORDER BY
gl.party DESC gl.party DESC""".format(conditions=conditions), {
""", {
"fiscal_year": filters.fiscal_year, "fiscal_year": filters.fiscal_year,
"supplier_group": filters.supplier_group,
"company": filters.company "company": filters.company
}, as_dict=True) }, as_dict=True)
@ -79,13 +85,13 @@ def get_columns():
"fieldname": "tax_id", "fieldname": "tax_id",
"label": _("Tax ID"), "label": _("Tax ID"),
"fieldtype": "Data", "fieldtype": "Data",
"width": 120 "width": 200
}, },
{ {
"fieldname": "payments", "fieldname": "payments",
"label": _("Total Payments"), "label": _("Total Payments"),
"fieldtype": "Currency", "fieldtype": "Currency",
"width": 120 "width": 200
} }
] ]