From 318fa030201b035b861447db15e82f68bd243ac4 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Tue, 4 Jun 2019 14:08:47 +0200
Subject: [PATCH] [IMP] base_setup: Remove group_multi_company on res.config

A user is supposed to be put in the group_multi_company group when the
he is allowed in several companies. Activating the feature for all the users
is not necessary.
---
 addons/base_setup/models/res_config_settings.py       |  1 -
 addons/base_setup/views/res_config_settings_views.xml | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py
index c8b5a6ff0c9..159be66fe2e 100644
--- a/addons/base_setup/models/res_config_settings.py
+++ b/addons/base_setup/models/res_config_settings.py
@@ -8,7 +8,6 @@ class ResConfigSettings(models.TransientModel):
 
     _inherit = 'res.config.settings'
 
-    group_multi_company = fields.Boolean("Manage multiple companies", implied_group='base.group_multi_company')
     company_id = fields.Many2one('res.company', string='Company', required=True,
         default=lambda self: self.env.company)
     user_default_rights = fields.Boolean(
diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index 8aff13e062b..5acfd343678 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -117,20 +117,17 @@
                                 </div>
                             </div>
                         </div>
-                        <div id="multi_company">
+                        <div id="multi_company" groups="base.group_multi_company">
                             <field name="company_id" invisible="1"/>
                             <h2>Multi-companies</h2>
                             <div class="row mt16 o_settings_container" name="multi_company">
                                 <div class="col-12 col-lg-6 o_setting_box">
-                                    <div class="o_setting_left_pane">
-                                        <field name="group_multi_company"/>
-                                    </div>
                                     <div class="o_setting_right_pane">
-                                        <label string="Multi-companies" for="group_multi_company"/>
+                                        <label string="Multi-companies" for="multi_company"/>
                                         <div class="text-muted">
                                             Manage multiple legal entities with separate accounting
                                         </div>
-                                        <div class="content-group" attrs="{'invisible': [('group_multi_company','=',False)]}">
+                                        <div class="content-group">
                                             <div class="mt16">
                                                 <button name="%(base.action_res_company_form)d" icon="fa-arrow-right" type="action" string="Companies" class="btn-link"/>
                                             </div>
@@ -141,7 +138,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-12 col-lg-6 o_setting_box" title="Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company." attrs="{'invisible': [('group_multi_company', '=', False)]}" id="inter_company">
+                                <div class="col-12 col-lg-6 o_setting_box" title="Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company." id="inter_company">
                                     <div class="o_setting_left_pane">
                                         <field name="module_inter_company_rules" widget="upgrade_boolean"/>
                                     </div>