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

fix: get sales partner for leaderboard

Browse Source 
(cherry picked from commit 40c1acc961d29394fb47ef6108864c7690331457)
This commit is contained in:
barredterra 2023-12-11 19:45:32 +01:00 committed by Mergify
parent 2fcfebe1d3
commit 3845d4294c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/startup/leaderboard.py
View File

@ -171,20 +171,20 @@ def get_all_suppliers(date_range, company, field, limit=None):
@frappe.whitelist() @frappe.whitelist()
def get_all_sales_partner(date_range, company, field, limit=None): def get_all_sales_partner(date_range, company, field, limit=None):
if field == "total_sales_amount": if field == "total_sales_amount":
select_field = "sum(`base_net_total`)" select_field = "base_net_total"
elif field == "total_commission": elif field == "total_commission":
select_field = "sum(`total_commission`)" select_field = "total_commission"
filters = {"sales_partner": ["!=", ""], "docstatus": 1, "company": company} filters = [["docstatus", "=", "1"], ["company", "=", company], ["sales_partner", "is", "set"]]
if date_range: from_date, to_date = parse_date_range(date_range)
date_range = frappe.parse_json(date_range) if from_date and to_date:
filters["transaction_date"] = ["between", [date_range[0], date_range[1]]] filters.append(["transaction_date", "between", [from_date, to_date]])
return frappe.get_list( return frappe.get_list(
"Sales Order", "Sales Order",
fields=[ fields=[
"`sales_partner` as name", "sales_partner as name",
"{} as value".format(select_field), f"sum({select_field}) as value",
], ],
filters=filters, filters=filters,
group_by="sales_partner", group_by="sales_partner",