From 2ec5afde1c04ff1cde1e2b881bf72946e72f23d0 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 30 Aug 2015 18:53:55 +0200 Subject: [PATCH] [IMP] Better CRM Dashboard [IMP] Tax name may not be uniq (sale and purchase tax with simple 21% name) [IMP] CSS of kanban --- addons/account/models/account.py | 4 ---- addons/crm/report/crm_activity_report_view.xml | 9 +++++++++ addons/crm/sales_team_dashboard.xml | 15 ++++++++++++++- addons/sale/sales_team_dashboard.xml | 4 ++-- .../static/src/less/sales_team_dashboard.less | 3 ++- .../static/src/less/kanban_dashboard.less | 2 +- 6 files changed, 28 insertions(+), 9 deletions(-) diff --git a/addons/account/models/account.py b/addons/account/models/account.py index 8cd3943d9a1..42dec99fdb3 100644 --- a/addons/account/models/account.py +++ b/addons/account/models/account.py @@ -499,10 +499,6 @@ class AccountTax(models.Model): tag_ids = fields.Many2many('account.account.tag', 'account_tax_account_tag', string='Tags', help="Optional tags you may want to assign for custom reporting") tax_group_id = fields.Many2one('account.tax.group', string="Tax Group", default=_default_tax_group, required=True) - _sql_constraints = [ - ('name_company_uniq', 'unique(name, company_id)', 'Tax names must be unique !'), - ] - @api.one @api.constrains('children_tax_ids', 'type_tax_use') def _check_children_scope(self): diff --git a/addons/crm/report/crm_activity_report_view.xml b/addons/crm/report/crm_activity_report_view.xml index d755f0d1aaa..5ba2f13e8e2 100644 --- a/addons/crm/report/crm_activity_report_view.xml +++ b/addons/crm/report/crm_activity_report_view.xml @@ -62,5 +62,14 @@ groups="base.group_sale_manager" parent="base.menu_sale_report" action="crm_activity_report_action" sequence="7"/> + + Activities Analysis + crm.activity.report + form + pivot,graph + {'search_default_team_id': active_id} + [] + + diff --git a/addons/crm/sales_team_dashboard.xml b/addons/crm/sales_team_dashboard.xml index d3e088f971f..4d706903a57 100644 --- a/addons/crm/sales_team_dashboard.xml +++ b/addons/crm/sales_team_dashboard.xml @@ -37,6 +37,19 @@ + + + + + @@ -77,4 +90,4 @@ - \ No newline at end of file + diff --git a/addons/sale/sales_team_dashboard.xml b/addons/sale/sales_team_dashboard.xml index 490efb894f9..6b708034e81 100644 --- a/addons/sale/sales_team_dashboard.xml +++ b/addons/sale/sales_team_dashboard.xml @@ -51,7 +51,7 @@
- Click here to define an invoicing target + Click to define a team target
@@ -100,4 +100,4 @@
- \ No newline at end of file + 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 9bd4f900baf..058af6b6533 100644 --- a/addons/sales_team/static/src/less/sales_team_dashboard.less +++ b/addons/sales_team/static/src/less/sales_team_dashboard.less @@ -3,7 +3,8 @@ padding: 0; // remove the padding of the kanban view .o_kanban_record { - min-width: 450px; + min-width: 420px; + min-height: 250px; @media (max-width: @grid-float-breakpoint) { min-width: inherit; diff --git a/addons/web_kanban/static/src/less/kanban_dashboard.less b/addons/web_kanban/static/src/less/kanban_dashboard.less index 6097ab97d8b..df04f2b4498 100644 --- a/addons/web_kanban/static/src/less/kanban_dashboard.less +++ b/addons/web_kanban/static/src/less/kanban_dashboard.less @@ -108,7 +108,7 @@ padding: 16px; } .o_kanban_primary_bottom { - background-color: lightgrey; + background-color: rgba(0,0,0,0.07); position: absolute; bottom: 0; padding: 15px;