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 @@
-
-
-
+
+
+
@@ -69,7 +69,7 @@
-
+
-
+
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 @@
-
-
-
-
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 @@
-
-
+
+
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 @@
-
- Enable Light Multi Company
-
-
Multi Companies
-