[IMP] base: Merge group_light_multi_company into group_multi_company

This distinction is useless and confusing.

5 files changed, 11 insertions, 20 deletions

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">
diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index ca4fdb1b459..1eaf3b296eb 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -143,10 +143,6 @@
             <field name="category_id" ref="module_category_usability"/>
         </record>
 
-        <record model="res.groups" id="group_light_multi_company">
-            <field name="category_id" ref="module_category_hidden"/>
-        </record>
-
         <record model="res.groups" id="group_multi_currency">
             <field name="category_id" ref="module_category_usability"/>
         </record>
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index cb693aaadea..89d50dc362b 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -144,8 +144,8 @@
                                 <field name="login"
                                         placeholder="email@yourcompany.com"/>
                             </h2>
-                            <label for="company_id" class="oe_edit_only" groups="base.group_light_multi_company"/>
-                            <field name="company_id" context="{'user_preference': 0}" groups="base.group_light_multi_company"/>
+                            <label for="company_id" class="oe_edit_only" groups="base.group_multi_currency"/>
+                            <field name="company_id" context="{'user_preference': 0}" groups="base.group_multi_currency"/>
                         </div>
                         <group>
                             <label for="groups_id" string="Access Rights"
@@ -236,7 +236,7 @@
             <field name="arch" type="xml">
                 <search string="Users">
                     <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('login','ilike',self), ('email','ilike',self)]" string="User"/>
-                    <field name="company_ids" string="Company" groups="base.group_light_multi_company"/>
+                    <field name="company_ids" string="Company" groups="base.group_multi_currency"/>
                     <field name="share"/>
                     <filter name="no_share" string="Internal Users" domain="[('share','=',False)]"/>
                     <filter name="Inactive" string="Inactive Users" domain="[('active','=',False)]"/>
@@ -294,7 +294,7 @@
                         <field name="tz" widget="timezone_mismatch" options="{'tz_offset_field': 'tz_offset'}" readonly="0"/>
                         <field name="tz_offset" invisible="1"/>
                         <field name="company_id" options="{'no_create': True}" readonly="0"
-                            groups="base.group_light_multi_company"/>
+                            groups="base.group_multi_currency"/>
                     </group>
                     <group string="Email Preferences">
                         <field name="email" widget="email" readonly="0"/>
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index 416f965ae94..3e9b0bed0dd 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -29,13 +29,8 @@
             <field name="groups_id" eval="[(4,ref('base.group_user'))]"/>
         </record>
 
-        <record model="res.groups" id="group_light_multi_company">
-            <field name="name">Enable Light Multi Company</field>
-        </record>
-
         <record model="res.groups" id="group_multi_company">
             <field name="name">Multi Companies</field>
-            <field name="implied_ids" eval="[(4, ref('group_light_multi_company'))]"/>
         </record>
 
         <record model="res.groups" id="group_multi_currency">