diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index b6c12e111ff..728f1d43647 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -11,15 +11,6 @@
child_id
-
en_US
@@ -75,7 +66,6 @@
-
--
Administrator
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 32e81ee600f..5bbd397a8e3 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -154,8 +154,7 @@ class res_users(osv.osv):
"a change of password, the user has to login again."),
'signature': fields.text('Signature'),
'active': fields.boolean('Active'),
- 'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),
- 'menu_id': fields.many2one('ir.actions.actions', 'Menu Action', help="If specified, the action will replace the standard menu for this user."),
+ 'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at log on for this user, in addition to the standard menu."),
'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
# Special behavior for this field: res.company.search() will only return the companies
# available to the current user (should be the user's companies?), when the user_preference
@@ -217,16 +216,6 @@ class res_users(osv.osv):
return [c]
return False
- def _get_menu(self,cr, uid, context=None):
- dataobj = self.pool.get('ir.model.data')
- try:
- model, res_id = dataobj.get_object_reference(cr, uid, 'base', 'action_menu_admin')
- if model != 'ir.actions.act_window':
- return False
- return res_id
- except ValueError:
- return False
-
def _get_group(self,cr, uid, context=None):
dataobj = self.pool.get('ir.model.data')
result = []
@@ -244,7 +233,6 @@ class res_users(osv.osv):
'password': '',
'active': True,
'customer': False,
- 'menu_id': _get_menu,
'company_id': _get_company,
'company_ids': _get_companies,
'groups_id': _get_group,
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 8a3f372af7a..ba1cee1e140 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -201,7 +201,6 @@
-