diff --git a/crm/api/dashboard.py b/crm/api/dashboard.py index 3a5d31b7..94fbd623 100644 --- a/crm/api/dashboard.py +++ b/crm/api/dashboard.py @@ -734,8 +734,10 @@ def get_deals_by_stage(from_date="", to_date="", user="", deal_conds=""): f""" SELECT d.status AS stage, - COUNT(*) AS count + COUNT(*) AS count, + s.type AS status_type FROM `tabCRM Deal` AS d + JOIN `tabCRM Deal Status` s ON d.status = s.name WHERE DATE(d.creation) BETWEEN %(from)s AND %(to)s {deal_conds} GROUP BY d.status diff --git a/frontend/src/pages/Dashboard.vue b/frontend/src/pages/Dashboard.vue index 8e5da6d5..e118a694 100644 --- a/frontend/src/pages/Dashboard.vue +++ b/frontend/src/pages/Dashboard.vue @@ -59,7 +59,7 @@ doctype="User" :filters="{ name: ['in', users.data.crmUsers?.map((u) => u.name)] }" @change="(v) => updateFilter('user', v)" - :placeholder="__('Sales User')" + :placeholder="__('Sales user')" :hideMe="true" >