diff --git a/addons/crm/models/crm_team.py b/addons/crm/models/crm_team.py index f09eb6982b0..caae4f3d5e1 100644 --- a/addons/crm/models/crm_team.py +++ b/addons/crm/models/crm_team.py @@ -188,5 +188,5 @@ class Team(models.Model): def _graph_title_and_key(self): if self.dashboard_graph_model == 'pipeline': - return [_('Pipeline'), _('Expected Revenue')] + return ['', _('Expected Revenue')] # no more title return super(Team, self)._graph_title_and_key() diff --git a/addons/pos_sale/models/crm_team.py b/addons/pos_sale/models/crm_team.py index f2af268a0db..d7c8bce44c9 100644 --- a/addons/pos_sale/models/crm_team.py +++ b/addons/pos_sale/models/crm_team.py @@ -113,5 +113,5 @@ class CrmTeam(models.Model): def _graph_title_and_key(self): if self.team_type == 'pos': - return [_('Sales'), _('Untaxed Amount')] + return ['', _('Untaxed Amount')] # no more title return super(CrmTeam, self)._graph_title_and_key() diff --git a/addons/sale/models/sales_team.py b/addons/sale/models/sales_team.py index 7dbd1251d1e..a318b32ecdd 100644 --- a/addons/sale/models/sales_team.py +++ b/addons/sale/models/sales_team.py @@ -94,9 +94,9 @@ class CrmTeam(models.Model): def _graph_title_and_key(self): if self.dashboard_graph_model == 'sales': - return [_('Sales'), _('Untaxed Total')] + return ['', _('Untaxed Total')] # no more title elif self.dashboard_graph_model == 'invoices': - return [_('Invoices'), _('Untaxed Total')] + return ['', _('Untaxed Total')] return super(CrmTeam, self)._graph_title_and_key() def _compute_dashboard_button_name(self): 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 55f9f625da1..2665f6b9960 100644 --- a/addons/sales_team/static/src/less/sales_team_dashboard.less +++ b/addons/sales_team/static/src/less/sales_team_dashboard.less @@ -9,21 +9,21 @@ min-width: 450px; } .o_kanban_card_upper_content { - margin-bottom: @odoo-horizontal-padding*3 + @o-kanban-progressbar-height + 85px; + margin-bottom: @odoo-horizontal-padding*2 + @o-kanban-progressbar-height + 85px; } .o_sales_team_kanban_graph_section { margin-bottom: @odoo-horizontal-padding*2 + @o-kanban-progressbar-height; .o-position-absolute(@bottom: 0, @left: 0, @right: 0); .o_graph_linechart { > svg { - height: 75px; + height: 80px; // X axis g.nv-x.nv-axis { // move the labels up, so they aren't hidden below the graph, and the lines back down. transform: translateY(50px); line { - transform: translateY(25px); + transform: translateY(30px); } .nv-axislabel{ transform:translateY(-78px); @@ -63,7 +63,7 @@ } .o_graph_barchart { > svg { - height: 75px; + height: 95px; overflow: visible; g.nv-barsWrap { g.nv-group.nv-series-0 { diff --git a/addons/sales_team/views/sales_team_dashboard.xml b/addons/sales_team/views/sales_team_dashboard.xml index f7d8b9c8df8..dd4a69fb99b 100644 --- a/addons/sales_team/views/sales_team_dashboard.xml +++ b/addons/sales_team/views/sales_team_dashboard.xml @@ -27,7 +27,7 @@