nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(territory_wise_sales):replace sql with orm (#55177)

Browse Source
This commit is contained in:
Loic Oberle
2026-05-22 12:39:41 +02:00
committed by GitHub
parent f6bf7d85ad
commit 1135429181
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,29 +104,20 @@ def get_data(filters=None):
def get_opportunities(filters):
conditions = ""
orm_filters = {}
if filters.get("transaction_date"):
conditions = " WHERE transaction_date between {} and {}".format(
frappe.db.escape(filters["transaction_date"][0]),
frappe.db.escape(filters["transaction_date"][1]),
)
orm_filters["transaction_date"] = [
"between",
[filters["transaction_date"][0], filters["transaction_date"][1]],
]
if filters.company:
if conditions:
conditions += " AND"
else:
conditions += " WHERE"
conditions += " company = %(company)s"
if filters.get("company"):
orm_filters["company"] = filters["company"]
return frappe.db.sql(
f"""
SELECT name, territory, opportunity_amount
FROM `tabOpportunity` {conditions}
""",
filters,
as_dict=1,
) # nosec
return frappe.get_all(
"Opportunity", fields=["name", "territory", "opportunity_amount"], filters=orm_filters
)
def get_quotations(opportunities):