[MERGE] trunk-v62_config (new config settings)

bzr revid: rco@openerp.com-20120515142754-inmaclzdqqvh6tu0

openerp/addons/base/base_menu.xml

@@ -7,7 +7,7 @@
         <menuitem id="menu_administration" name="Settings" sequence="100" icon="terp-administration"/>
             <menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
             <menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
-                <menuitem id="menu_custom" name="Technical" parent="menu_config" sequence="8" groups="base.group_no_one"/>
+                <menuitem id="menu_custom" name="Technical" parent="menu_config" sequence="110" groups="base.group_no_one"/>
                     <menuitem id="next_id_2" name="User Interface" parent="menu_custom"/>
                     <menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
                     <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>

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_custom" sequence="21" groups="base.group_no_one"/>
         <menuitem action="ir_sequence_form" id="menu_ir_sequence_form" parent="next_id_5"/>
 
         <!-- Sequences Types -->

openerp/addons/base/module/module.py

@@ -351,15 +351,13 @@ class module(osv.osv):
         if config.get('type') not in ('ir.actions.reload', 'ir.actions.act_window_close'):
             return config
 
+        # reload the client
         menu_ids = self.root_menus(cr,uid,ids,context)
-        if menu_ids:
-            action = {
-                'type': 'ir.ui.menu',
-                'menu_id': menu_ids[0],
-                'reload' : True,
-            }
-            return action
-        return False
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'reload',
+            'params': {'menu_id': menu_ids and menu_ids[0] or False},
+        }
 
     def button_install_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'uninstalled', 'demo':False})

openerp/addons/base/res/res_config.py

@@ -539,19 +539,10 @@ class res_config_settings(osv.osv_memory):
         if to_install_ids:
             ir_module.button_immediate_install(cr, uid, to_install_ids, context)
 
-        # open the menu for this wizard (or Settings), and force client-side refresh
-        act_ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('res_model', '=', self._name)])
-        act_refs = ['ir.actions.act_window,%s' % id for id in act_ids]
-        val_ids = ir_values.search(cr, uid, [('model', '=', 'ir.ui.menu'), ('key', '=', 'action'),
-                        ('key2', '=', 'tree_but_open'), ('value', 'in', act_refs)])
-        if val_ids:
-            menu_id = ir_values.browse(cr, uid, val_ids[0]).res_id
-        else:
-            menu_id = ir_model_data.get_object(cr, uid, 'base', 'menu_administration', context).id
+        # force client-side reload (update user menu and current view)
         return {
-            'type': 'ir.ui.menu',
-            'menu_id': menu_id,
-            'reload': True,
+            'type': 'ir.actions.client',
+            'tag': 'reload',
         }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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):

openerp/addons/base/res/res_partner_view.xml

@@ -541,7 +541,7 @@
         </record>
 
         <record id="action_partner_form" model="ir.actions.act_window">
-            <field name="name">Contacts</field>
+            <field name="name">Customers</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>

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,