nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-28 11:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: f-string and where clause

Browse Source 
Used f-string formatting and added conditions to WHERE clause
This commit is contained in:
Maharshi Patel
2022-08-09 18:22:05 +05:30
parent 6c574fbf33
commit 42b395916d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
View File

@@ -140,7 +140,7 @@ def get_items(filters):
match_conditions = " and {0} ".format(match_conditions) match_conditions = " and {0} ".format(match_conditions)
items = frappe.db.sql( items = frappe.db.sql(
""" f"""
SELECT SELECT
`tabSales Invoice Item`.gst_hsn_code, `tabSales Invoice Item`.gst_hsn_code,
`tabSales Invoice Item`.stock_uom, `tabSales Invoice Item`.stock_uom,
@@ -153,10 +153,11 @@ def get_items(filters):
FROM FROM
`tabSales Invoice` `tabSales Invoice`
INNER JOIN `tabSales Invoice Item` ON `tabSales Invoice`.name = `tabSales Invoice Item`.parent INNER JOIN `tabSales Invoice Item` ON `tabSales Invoice`.name = `tabSales Invoice Item`.parent
INNER JOIN `tabGST HSN Code` ON `tabSales Invoice Item`.gst_hsn_code = `tabGST HSN Code`.name % s % s INNER JOIN `tabGST HSN Code` ON `tabSales Invoice Item`.gst_hsn_code = `tabGST HSN Code`.name
WHERE WHERE
`tabSales Invoice`.docstatus = 1 `tabSales Invoice`.docstatus = 1
AND `tabSales Invoice Item`.gst_hsn_code IS NOT NULL AND `tabSales Invoice Item`.gst_hsn_code IS NOT NULL
{conditions}
GROUP BY GROUP BY
`tabSales Invoice Item`.parent, `tabSales Invoice Item`.parent,
`tabSales Invoice Item`.item_code, `tabSales Invoice Item`.item_code,
@@ -165,8 +166,9 @@ def get_items(filters):
ORDER BY ORDER BY
`tabSales Invoice Item`.gst_hsn_code, `tabSales Invoice Item`.gst_hsn_code,
`tabSales Invoice Item`.uom `tabSales Invoice Item`.uom
""" """.format(
% (conditions, match_conditions), conditions=conditions
),
filters, filters,
as_dict=1, as_dict=1,
) )