nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-28 09:24:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(territory_wise_sales):replace sql with query builder (#55174)

Browse Source
This commit is contained in:
Loic Oberle
2026-05-22 13:45:56 +02:00
committed by GitHub
parent b71eacd6b3
commit e11e386fff
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/selling/report/territory_wise_sales/territory_wise_sales.py
View File

@@ -154,17 +154,21 @@ def get_sales_invoice(sales_orders):
if not sales_orders:
return []
so_names = [so.name for so in sales_orders]
so_names = [so.get("name") for so in sales_orders]
return frappe.db.sql(
"""
SELECT si.name, si.base_grand_total, sii.sales_order
FROM `tabSales Invoice` si, `tabSales Invoice Item` sii
WHERE si.docstatus=1 AND si.name = sii.parent AND sii.sales_order in ({})
""".format(", ".join(["%s"] * len(so_names))),
tuple(so_names),
as_dict=1,
) # nosec
SalesInvoice = frappe.qb.DocType("Sales Invoice")
SalesInvoiceItem = frappe.qb.DocType("Sales Invoice Item")
query = (
frappe.qb.from_(SalesInvoice)
.join(SalesInvoiceItem)
.on(SalesInvoice.name == SalesInvoiceItem.parent)
.select(SalesInvoice.name, SalesInvoice.base_grand_total, SalesInvoiceItem.sales_order)
.where(SalesInvoice.docstatus == 1)
.where(SalesInvoiceItem.sales_order.isin(so_names))
)
return query.run(as_dict=True)
def _get_total(doclist, amount_field="base_grand_total"):