diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 242c8185d00..ba42a623d87 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/openerp/addons/base/res/res_lang.py b/openerp/addons/base/res/res_lang.py
index 13acf109b04..07b220a6ee3 100644
--- a/openerp/addons/base/res/res_lang.py
+++ b/openerp/addons/base/res/res_lang.py
@@ -58,9 +58,6 @@ class lang(osv.osv):
default_value = ir_values_obj.get(cr, uid, 'default', False, ['res.partner'])
if not default_value:
ir_values_obj.set(cr, uid, 'default', False, 'lang', ['res.partner'], lang)
- default_value = ir_values_obj.get(cr, uid, 'default', False, ['res.users'])
- if not default_value:
- ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], lang)
return True
def load_lang(self, cr, uid, lang, lang_name=None):
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index e7c517cdbe5..64c23f265e8 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -324,10 +324,11 @@ class users(osv.osv):
# default avatar file name: avatar0 -> avatar6.png, choose randomly
avatar_path = openerp.modules.get_module_resource('base', 'static/src/img', 'avatar%d.png' % random.randint(0, 6))
return self._avatar_resize(cr, uid, open(avatar_path, 'rb').read().encode('base64'), context=context)
-
+
_defaults = {
'password' : '',
- 'context_lang': 'en_US',
+ 'context_lang': lambda self, cr, uid, context: context.get('lang', 'en_US'),
+ 'context_tz': lambda self, cr, uid, context: context.get('tz', False),
'avatar': _get_avatar,
'active' : True,
'menu_id': _get_menu,