From 5fa3b433064f736ed87ba928ca1015cb26ac1ed7 Mon Sep 17 00:00:00 2001
From: Meghna Jaswani <mja@odoo.com>
Date: Wed, 31 Jul 2019 13:26:16 +0000
Subject: [PATCH] [FIX] crm: removed field allowing to install dead module

Module module_crm_phone_validation and its checkbox from py and xml file
because the module crm_phone_validation is moved to module crm since f60825b43979345b456510db25f70264a93cbdb0 .

Also moved label of phone_international_format to help directly inside settings
view in order to have a nice looking configuration page.

Task 2036270

closes odoo/odoo#35377

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/crm/models/res_config_settings.py       |  1 -
 addons/crm/views/res_config_settings_views.xml | 12 ++++--------
 addons/phone_validation/models/res_company.py  |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/addons/crm/models/res_config_settings.py b/addons/crm/models/res_config_settings.py
index 6b8c622bfbb..aa9783f4dbb 100644
--- a/addons/crm/models/res_config_settings.py
+++ b/addons/crm/models/res_config_settings.py
@@ -11,7 +11,6 @@ class ResConfigSettings(models.TransientModel):
     crm_alias_prefix = fields.Char('Default Alias Name for Leads')
     generate_lead_from_alias = fields.Boolean('Manual Assignation of Emails', config_parameter='crm.generate_lead_from_alias')
     group_use_lead = fields.Boolean(string="Leads", implied_group='crm.group_use_lead')
-    module_crm_phone_validation = fields.Boolean("Phone Formatting")
     module_crm_iap_lead = fields.Boolean("Generate new leads based on their country, industries, size, etc.")
     module_crm_iap_lead_website = fields.Boolean("Create Leads/Opportunities from your website's traffic")
     lead_mining_in_pipeline = fields.Boolean("Create a lead mining request directly from the opportunity pipeline.", config_parameter='crm.lead_mining_in_pipeline')
diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml
index ed20f377978..b65b3bcbc53 100644
--- a/addons/crm/views/res_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -103,17 +103,13 @@
                     <h2>Contacts</h2>
                     <div class="row mt16 o_settings_container">
                         <div class="col-lg-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_crm_phone_validation"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_crm_phone_validation"/>
-                                <div class="text-muted" id="module_crm_phone_validation">
+                            <div class="o_setting_right_pane" title="Always encode phone numbers using international format. Otherwise numbers coming from the company's country are nationally formatted. International numbers are always using international format.">
+                                <b>Phone Formatting</b>
+                                <div class="text-muted">
                                     Format phone numbers based on national conventions
                                 </div>
                                 <div class="content-group">
-                                    <div class="mt16" attrs="{'invisible': [('module_crm_phone_validation','=',False)]}">
-                                        <label for="crm_phone_valid_method" class="o_light_label"/>
+                                    <div class="mt16">
                                         <field name="crm_phone_valid_method" widget="radio" class="o_light_label"/>
                                     </div>
                                 </div>
diff --git a/addons/phone_validation/models/res_company.py b/addons/phone_validation/models/res_company.py
index 2ee2c18d7bd..df53ca6196b 100644
--- a/addons/phone_validation/models/res_company.py
+++ b/addons/phone_validation/models/res_company.py
@@ -12,6 +12,6 @@ class ResCompany(models.Model):
         ('prefix', 'Add international prefix'),
     ], string="Local Numbers", default="prefix",
         help="Always encode phone numbers using international format. Otherwise "
-             "numbers coming from the company's country are nationaly formatted. "
+             "numbers coming from the company's country are nationally formatted. "
              "International numbers are always using international format."
     )