From 8a2f4e7d3fc4abe4bf449123f8b9598bb4a48d14 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Mon, 7 Mar 2016 11:14:59 +0100
Subject: [IMP] base: Merge group_light_multi_company into group_multi_company

This distinction is useless and confusing.
---
 addons/base_setup/res_config.py       |  4 ++--
 addons/base_setup/res_config_view.xml | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'addons/base_setup')

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index c04e41fa00e..ed2f5dc53d1 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -9,9 +9,9 @@ class base_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'group_light_multi_company': fields.boolean('Manage multiple companies',
+        'group_multi_currency': fields.boolean('Manage multiple companies',
             help='Work in multi-company environments, with appropriate security access between companies.',
-            implied_group='base.group_light_multi_company'),
+            implied_group='base.group_multi_currency'),
         'module_share': fields.boolean('Allow documents sharing',
             help="""Share or embbed any screen of Odoo."""),
         'module_portal': fields.boolean('Activate the customer portal',
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index a18fbce50e4..3106810bd07 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -57,9 +57,9 @@
                     </group>
                     <group>
                         <label for="id" string="Multi Company"/>
-                        <div name="group_light_multi_company">
-                            <field name="group_light_multi_company" class="oe_inline"/>
-                            <label for="group_light_multi_company"/>
+                        <div name="group_multi_currency">
+                            <field name="group_multi_currency" class="oe_inline"/>
+                            <label for="group_multi_currency"/>
                         </div>
                     </group>
                     <group>
@@ -69,7 +69,7 @@
                             <label for="group_multi_currency"/>
                         </div>
                     </group>
-                    <group attrs="{'invisible': [('group_light_multi_company','=',False)]}">
+                    <group attrs="{'invisible': [('group_multi_currency','=',False)]}">
                         <label for="module_inter_company_rules" string="Inter company"/>
                         <div name="inter_company">
                             <div name="module_inter_company_rules">
@@ -78,7 +78,7 @@
                             </div>
                         </div>
                     </group>
-                    <group string="Shared resources" name="company_share_resources" attrs="{'invisible': [('group_light_multi_company','=',False)]}">
+                    <group string="Shared resources" name="company_share_resources" attrs="{'invisible': [('group_multi_currency','=',False)]}">
                         <field name="company_share_partner" class="oe_inline" />
                     </group>
                     <group string="Google Integration" name="google">
-- 
cgit v1.2.3