From c7de4ff68ca417b0ccfe348a45c0c2b6ce14cd12 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 1 Feb 2022 10:08:46 +0000 Subject: [PATCH] [IMP] website_crm: Remove Contact Us configurations Purpose ======= It's configurable from the website editor itself. Keep the default fields on the website model in case someone changes its mind though. closes odoo/odoo#82999 Related: odoo/upgrade#3210 Related: odoo/enterprise#23612 Signed-off-by: Yannick Tivisse (yti) --- addons/website_crm/__manifest__.py | 1 - addons/website_crm/models/__init__.py | 1 - .../website_crm/models/res_config_settings.py | 20 ---------- .../views/res_config_settings_views.xml | 37 ------------------- 4 files changed, 59 deletions(-) delete mode 100644 addons/website_crm/models/res_config_settings.py delete mode 100644 addons/website_crm/views/res_config_settings_views.xml diff --git a/addons/website_crm/__manifest__.py b/addons/website_crm/__manifest__.py index 25f1515d3e9..bb0434b8fe8 100644 --- a/addons/website_crm/__manifest__.py +++ b/addons/website_crm/__manifest__.py @@ -19,7 +19,6 @@ This module includes contact phone and mobile numbers validation.""", 'data/ir_actions_data.xml', 'data/ir_model_data.xml', 'views/crm_lead_views.xml', - 'views/res_config_settings_views.xml', 'views/website_visitor_views.xml', 'views/website_templates_contactus.xml', ], diff --git a/addons/website_crm/models/__init__.py b/addons/website_crm/models/__init__.py index 996526e1072..a78e1009031 100644 --- a/addons/website_crm/models/__init__.py +++ b/addons/website_crm/models/__init__.py @@ -2,6 +2,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import crm_lead -from . import res_config_settings from . import website from . import website_visitor diff --git a/addons/website_crm/models/res_config_settings.py b/addons/website_crm/models/res_config_settings.py deleted file mode 100644 index c78d51fd3c7..00000000000 --- a/addons/website_crm/models/res_config_settings.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import fields, models - - -class ResConfigSettings(models.TransientModel): - _inherit = 'res.config.settings' - - def _get_crm_default_team_domain(self): - if not self.env.user.has_group('crm.group_use_lead'): - return [('use_opportunities', '=', True)] - return [('use_leads', '=', True)] - - crm_default_team_id = fields.Many2one( - 'crm.team', string='Default Sales Team', related='website_id.crm_default_team_id', readonly=False, - domain=lambda self: self._get_crm_default_team_domain(), - help='Default Sales Team for new leads created through the Contact Us form.') - crm_default_user_id = fields.Many2one( - 'res.users', string='Default Salesperson', related='website_id.crm_default_user_id', domain=[('share', '=', False)], readonly=False, - help='Default salesperson for new leads created through the Contact Us form.') diff --git a/addons/website_crm/views/res_config_settings_views.xml b/addons/website_crm/views/res_config_settings_views.xml deleted file mode 100644 index b06a326620e..00000000000 --- a/addons/website_crm/views/res_config_settings_views.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - res.config.settings.view.form.inherit.website.crm - res.config.settings - - - -

Communication

-
-
-
- Contact Form -
- Add a contact form in the Contact Us page -
-
-
-
-
- Please set a Sales Team for the website. Otherwise you can't follow related events. -
-
- -
-
-
-
-
-
-
-
-