From adbf69680a0ea25bcdbe860ef463b482f3cc11d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 18 Dec 2020 13:07:44 +0000 Subject: [PATCH] [REF] crm: finalize multi sales-team and auto assign integration GLOBAL PURPOSE Ability to have salesmen belonging to several sales team is a core requirement of CRM. It is therefore moved from website_crm_score to crm along with cleaning and behavior improvement. Automatic lead assignment is also moved and cleaned. SPECIFICATIONS Make final integration of members management by taking into consideration both multi-membership and automatic lead assignment features. Correctly hide assignment options and fields if auto assign is not activated. This means that * when being in mono membership mode without automatic assign: display users on team form view; * when being in multi membership mode or with automatic assign: display members o2m records, as configuration is done on this model; * hide the whole right column in sales team form view about assignment when assignment is not activated in settings; LINKS Task ID-2086889 (main task) Task ID-2357969 (scoring migration task) Community PR odoo/odoo#48422 Enterprise PR odoo/enterprise#499 Upgrade PR odoo/upgrade#996 --- addons/crm/models/crm_team_member.py | 1 + addons/crm/views/crm_team_member_views.xml | 8 ++++++-- addons/crm/views/crm_team_views.xml | 20 ++++++++++++++++---- addons/sales_team/views/crm_team_views.xml | 5 ++--- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/addons/crm/models/crm_team_member.py b/addons/crm/models/crm_team_member.py index 4da8135573c..ddb5c9db0c7 100644 --- a/addons/crm/models/crm_team_member.py +++ b/addons/crm/models/crm_team_member.py @@ -19,6 +19,7 @@ class Team(models.Model): _inherit = 'crm.team.member' # assignment + assignment_enabled = fields.Boolean(related="crm_team_id.assignment_enabled") assignment_domain = fields.Char('Assignment Domain', tracking=True) assignment_max = fields.Integer('Max Leads (last 30 days)') lead_month_count = fields.Integer( diff --git a/addons/crm/views/crm_team_member_views.xml b/addons/crm/views/crm_team_member_views.xml index 07aea21f269..c3ba0dd8305 100644 --- a/addons/crm/views/crm_team_member_views.xml +++ b/addons/crm/views/crm_team_member_views.xml @@ -7,6 +7,7 @@ + @@ -19,7 +20,9 @@ -
+ +
@@ -34,7 +37,8 @@ - + +