Raphael Collet (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-v62_config into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-v62_config/+merge/105670
Improvements and completion of new config wizards.
This one changes the way the client is refreshed once a config is applied.
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-v62_config/+merge/105670
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-v62_config.
=== modified file 'openerp/addons/base/base_menu.xml'
--- openerp/addons/base/base_menu.xml 2012-04-25 08:12:50 +0000
+++ openerp/addons/base/base_menu.xml 2012-05-14 14:48:10 +0000
@@ -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"/>
=== modified file 'openerp/addons/base/ir/ir.xml'
--- openerp/addons/base/ir/ir.xml 2012-04-30 06:04:34 +0000
+++ openerp/addons/base/ir/ir.xml 2012-05-14 14:48:10 +0000
@@ -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 & Identifiers" parent="base.menu_config" sequence="21" groups="base.group_no_one"/>
+ <menuitem id="next_id_5" name="Sequences & 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 -->
=== modified file 'openerp/addons/base/res/res_config.py'
--- openerp/addons/base/res/res_config.py 2012-04-05 14:44:58 +0000
+++ openerp/addons/base/res/res_config.py 2012-05-14 14:48:10 +0000
@@ -539,19 +539,10 @@
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_all',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'openerp/addons/base/res/res_lang.py'
--- openerp/addons/base/res/res_lang.py 2012-01-24 13:17:05 +0000
+++ openerp/addons/base/res/res_lang.py 2012-05-14 14:48:10 +0000
@@ -58,9 +58,6 @@
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):
=== modified file 'openerp/addons/base/res/res_partner_view.xml'
--- openerp/addons/base/res/res_partner_view.xml 2012-04-25 08:12:50 +0000
+++ openerp/addons/base/res/res_partner_view.xml 2012-05-14 14:48:10 +0000
@@ -553,7 +553,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>
=== modified file 'openerp/addons/base/res/res_users.py'
--- openerp/addons/base/res/res_users.py 2012-04-30 06:04:34 +0000
+++ openerp/addons/base/res/res_users.py 2012-05-14 14:48:10 +0000
@@ -324,10 +324,11 @@
# 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,
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
