From 0d944fff3c8d3cdea7f7f07d81405a016af8696a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 18 Apr 2012 15:29:15 +0200
Subject: [PATCH 1/3] [IMP] base: renumber sequences of menus in Settings >
 Configuration

bzr revid: rco@openerp.com-20120418132915-t2xe25w5tmvswqj3
---
 openerp/addons/base/ir/ir.xml                | 8 ++++----
 openerp/addons/base/res/ir_property_view.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index ccec381f1d1..9502a4c729a 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -219,7 +219,7 @@
             <field name="view_id" ref="sequence_view_tree"/>
             <field name="context">{'active_test': False}</field>
         </record>
-        <menuitem id="next_id_5" name="Sequences &amp; Identifiers" parent="base.menu_config" sequence="21" groups="base.group_no_one"/>
+        <menuitem id="next_id_5" name="Sequences &amp; Identifiers" parent="base.menu_config" sequence="52" groups="base.group_no_one"/>
         <menuitem action="ir_sequence_form" id="menu_ir_sequence_form" parent="next_id_5"/>
 
         <!-- Sequences Types -->
@@ -1574,7 +1574,7 @@
             <field name="view_id" ref="ir_cron_view_tree"/>
         </record>
 
-        <menuitem id="next_id_10" name="Scheduler" parent="base.menu_config"  groups="base.group_extended" sequence="23"/>
+        <menuitem id="next_id_10" name="Scheduler" parent="base.menu_config"  groups="base.group_extended" sequence="54"/>
         <menuitem action="ir_cron_act" id="menu_ir_cron_act" parent="next_id_10"/>
 
 
@@ -1950,7 +1950,7 @@
             <field name="view_type">form</field>
             <field name="help">The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu.</field>
         </record>
-        <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="20"
+        <menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="51"
             groups="base.group_extended"/>
 
         <menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
@@ -2071,7 +2071,7 @@
             <field name="search_view_id" ref="view_ir_mail_server_search"/>
         </record>
 
-        <menuitem id="menu_email" name="Email" parent="base.menu_config" sequence="22"/>
+        <menuitem id="menu_email" name="Email" parent="base.menu_config" sequence="53"/>
         <menuitem id="menu_mail_servers" parent="menu_email" action="action_ir_mail_server_list" sequence="15" groups="base.group_no_one"/>
 
     </data>
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index d0292576199..fdaf89b2284 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -75,7 +75,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="ir_property_view_tree"/>
         </record>
-        <menuitem id="next_id_15" name="Parameters" parent="base.menu_config" groups="base.group_extended" sequence="24"/>
+        <menuitem id="next_id_15" name="Parameters" parent="base.menu_config" groups="base.group_extended" sequence="55"/>
         <menuitem action="ir_property_form" id="menu_ir_property_form_all" parent="base.next_id_15"/>
     </data>
 </openerp>

From 7d9a253df4d67fe866e8b57bc89d66e6308f6634 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 19 Apr 2012 16:21:14 +0200
Subject: [PATCH 2/3] [IMP] res_users: use current users' language and timezone
 as defaults for users

bzr revid: rco@openerp.com-20120419142114-glz51xj6ozubl07k
---
 openerp/addons/base/res/res_users.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 6ed6e7cc74c..f1359648ef1 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -361,10 +361,17 @@ 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)
-    
+
+    def _get_context_lang(self, cr, uid, context=None):
+        return self.browse(cr, uid, uid).context_lang
+
+    def _get_context_tz(self, cr, uid, context=None):
+        return self.browse(cr, uid, uid).context_tz
+
     _defaults = {
         'password' : '',
-        'context_lang': 'en_US',
+        'context_lang': _get_context_lang,
+        'context_tz': _get_context_tz,
         'avatar': _get_avatar,
         'active' : True,
         'menu_id': _get_menu,

From 15b90a133bcfd3248d94dd2ad3e5343c66bf5e7d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 20 Apr 2012 09:33:40 +0200
Subject: [PATCH 3/3] [FIX] res_users: remove global default for context_lang,
 and make current user determine default lang and tz of new users

bzr revid: rco@openerp.com-20120420073340-c48m9x46wh325dwz
---
 openerp/addons/base/res/res_lang.py  |  3 ---
 openerp/addons/base/res/res_users.py | 10 ++--------
 2 files changed, 2 insertions(+), 11 deletions(-)

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 f1359648ef1..eb758ef6e80 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -362,16 +362,10 @@ class users(osv.osv):
         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)
 
-    def _get_context_lang(self, cr, uid, context=None):
-        return self.browse(cr, uid, uid).context_lang
-
-    def _get_context_tz(self, cr, uid, context=None):
-        return self.browse(cr, uid, uid).context_tz
-
     _defaults = {
         'password' : '',
-        'context_lang': _get_context_lang,
-        'context_tz': _get_context_tz,
+        '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,