diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index dad3896087d..8942e0778c3 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -637,6 +637,15 @@ + + + + diff --git a/addons/sales_team/static/src/js/sales_team_dashboard.js b/addons/sales_team/static/src/js/sales_team_dashboard.js index bed2e738b1a..76982b2f57b 100644 --- a/addons/sales_team/static/src/js/sales_team_dashboard.js +++ b/addons/sales_team/static/src/js/sales_team_dashboard.js @@ -50,14 +50,22 @@ var SalesTeamDashboardView = KanbanView.extend({ var self = this; var $action = $(ev.currentTarget); var action_name = $action.attr('name'); + var action_extra = $action.data('extra'); var additional_context = {} // TODO: find a better way to add defaults to search view if (action_name === 'calendar.action_calendar_event') { additional_context['search_default_mymeetings'] = 1; - } - if (action_name === 'crm.crm_lead_opportunities') { - additional_context['search_default_assigned_to_me'] = 1; + } else if (action_name === 'crm.crm_lead_action_activities') { + if (action_extra === 'today') { + additional_context['search_default_today'] = 1; + } else if (action_extra === 'this_week') { + additional_context['search_default_this_week'] = 1; + } else if (action_extra === 'overdue') { + additional_context['search_default_overdue'] = 1; + } + } else if (action_name === 'crm.crm_opportunity_report_action_graph') { + additional_context['search_default_won'] = 1; } new Model("ir.model.data") diff --git a/addons/sales_team/static/src/less/sales_team_dashboard.less b/addons/sales_team/static/src/less/sales_team_dashboard.less index 5451abf3ddd..96a67c0a185 100644 --- a/addons/sales_team/static/src/less/sales_team_dashboard.less +++ b/addons/sales_team/static/src/less/sales_team_dashboard.less @@ -57,10 +57,6 @@ display: inline; } - .o_target_reached { - color: green; - } - a:hover { text-decoration: none; } diff --git a/addons/sales_team/static/src/xml/sales_team_dashboard.xml b/addons/sales_team/static/src/xml/sales_team_dashboard.xml index 8761f5af7cc..11951cbb48c 100644 --- a/addons/sales_team/static/src/xml/sales_team_dashboard.xml +++ b/addons/sales_team/static/src/xml/sales_team_dashboard.xml @@ -27,7 +27,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -74,7 +74,7 @@ - + overdue @@ -102,9 +102,9 @@
Performance
This Month - +
- + @@ -115,22 +115,22 @@ Activities Done - + - + - + 78,140.03€
Won in Opportunities
- + - + @@ -192,7 +192,7 @@ - +