From 0d944fff3c8d3cdea7f7f07d81405a016af8696a Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 18 Apr 2012 15:29:15 +0200 Subject: [PATCH 01/13] [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 @@ {'active_test': False} - + @@ -1574,7 +1574,7 @@ - + @@ -1950,7 +1950,7 @@ form 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. - - + 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 @@ form - + From 7d9a253df4d67fe866e8b57bc89d66e6308f6634 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 19 Apr 2012 16:21:14 +0200 Subject: [PATCH 02/13] [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 Date: Fri, 20 Apr 2012 09:33:40 +0200 Subject: [PATCH 03/13] [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, From 40b34f176a9182cd85a9ded542fda4b6a3bedb1b Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Thu, 26 Apr 2012 12:59:11 +0530 Subject: [PATCH 04/13] [IMP] Rename Contacts to Customers and put Sequences & Identifiers menu into Technical menu bzr revid: jap@tinyerp.com-20120426072911-srtx6upsed99c1sw --- openerp/addons/base/ir/ir.xml | 2 +- openerp/addons/base/res/res_partner_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 81c7cade5d0..0bf0d02e102 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -219,7 +219,7 @@ {'active_test': False} - + diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 24910d7cb41..71a2f99ef57 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -553,7 +553,7 @@ - Contacts + Customers ir.actions.act_window res.partner form From 8f2e81cdf8fbe791ae7b2d9fddc38a973ba11f74 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Thu, 26 Apr 2012 18:13:50 +0530 Subject: [PATCH 05/13] [IMP] Rename menu Configuration to General Settings bzr revid: jap@tinyerp.com-20120426124350-9sabhcyso003d3rp --- openerp/addons/base/base_menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index 797b94429b4..242c8185d00 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -6,7 +6,7 @@ - + From 6c695cbd543ea2aa536bfed770f4199a29803afe Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Fri, 27 Apr 2012 17:20:38 +0530 Subject: [PATCH 06/13] [IMP] Rename menu Configuration bzr revid: jap@tinyerp.com-20120427115038-v4znnx3qpj84g444 --- openerp/addons/base/base_menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index 242c8185d00..797b94429b4 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -6,7 +6,7 @@ - + From f7afab985f1273764d3c815f7b18473b43d5529d Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Fri, 27 Apr 2012 17:37:43 +0530 Subject: [PATCH 07/13] [IMP] Rename menu Configuration >> General Settings in base_menu.xml bzr revid: jap@tinyerp.com-20120427120743-bfmn57qppbjkobcz --- openerp/addons/base/base_menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index 797b94429b4..242c8185d00 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -6,7 +6,7 @@ - + From 2d1bd434ab86835ebc32a7070fa5edd6bbed5923 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 3 May 2012 10:23:40 +0200 Subject: [PATCH 08/13] [IMP] res.config.settings: return client action when execute is called bzr revid: rco@openerp.com-20120503082340-lzxarbtkfarnuyfw --- openerp/addons/base/res/res_config.py | 15 +++------------ openerp/addons/base/res/res_config.xml | 6 ++++++ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 0b348da3d74..e89fa69719e 100644 --- a/openerp/addons/base/res/res_config.py +++ b/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_all', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml index 2da5dc32e8e..6f665b0693a 100644 --- a/openerp/addons/base/res/res_config.xml +++ b/openerp/addons/base/res/res_config.xml @@ -85,5 +85,11 @@ + + + Reload Client Interface + reload_all + + From 2e2b4c533729b56d17177280a49860e61a30ebd1 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 3 May 2012 11:39:41 +0200 Subject: [PATCH 09/13] [FIX] res_config.xml: remove unnecessary client action definition that make tests fail bzr revid: rco@openerp.com-20120503093941-4jge9o6l572pmvq0 --- openerp/addons/base/res/res_config.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml index 6f665b0693a..2da5dc32e8e 100644 --- a/openerp/addons/base/res/res_config.xml +++ b/openerp/addons/base/res/res_config.xml @@ -85,11 +85,5 @@ - - - Reload Client Interface - reload_all - - From 6f5985d716fa605e5098ccc9dabcf7e6deb13713 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 9 May 2012 11:58:08 +0200 Subject: [PATCH 10/13] [FIX] base_menu: undo wrong menu renaming bzr revid: rco@openerp.com-20120509095808-icc2eucgqgzy0yeo --- openerp/addons/base/base_menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index ba42a623d87..4bc99a69b70 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -6,7 +6,7 @@ - + From b100b51bb969d43ec11f8017db15f826ca3f3cff Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 15 May 2012 14:10:16 +0200 Subject: [PATCH 11/13] [IMP] res.config.settings: rename client action 'reload_all' into 'reload' bzr revid: rco@openerp.com-20120515121016-tnmltjsgdqnw91cq --- openerp/addons/base/res/res_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index e89fa69719e..f28b023eddd 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -542,7 +542,7 @@ class res_config_settings(osv.osv_memory): # force client-side reload (update user menu and current view) return { 'type': 'ir.actions.client', - 'tag': 'reload_all', + 'tag': 'reload', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 46ef00e3c798fcaaca70d082504d2282de0d2878 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 15 May 2012 16:07:56 +0200 Subject: [PATCH 12/13] [IMP] module: use client action 'reload' when returning from module installation bzr revid: rco@openerp.com-20120515140756-vhw0aw71fbv0p08b --- openerp/addons/base/module/module.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index c6342307867..bd4369169da 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -351,15 +351,15 @@ class module(osv.osv): if config.get('type') not in ('ir.actions.reload', 'ir.actions.act_window_close'): return config + # reload the client + action = { + 'type': 'ir.actions.client', + 'tag': 'reload', + } 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 + action['params'] = {'menu_id': menu_ids[0]} + return action def button_install_cancel(self, cr, uid, ids, context=None): self.write(cr, uid, ids, {'state': 'uninstalled', 'demo':False}) From 0b553b45ed3c69152d513021c1bdf8bf7bcfbb85 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 15 May 2012 16:12:23 +0200 Subject: [PATCH 13/13] [IMP] module: simplify code to reload client bzr revid: rco@openerp.com-20120515141223-hflk9cd3acs4pbc0 --- openerp/addons/base/module/module.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index bd4369169da..c10807d79ea 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -352,14 +352,12 @@ class module(osv.osv): return config # reload the client - action = { + menu_ids = self.root_menus(cr,uid,ids,context) + return { 'type': 'ir.actions.client', 'tag': 'reload', + 'params': {'menu_id': menu_ids and menu_ids[0] or False}, } - menu_ids = self.root_menus(cr,uid,ids,context) - if menu_ids: - action['params'] = {'menu_id': menu_ids[0]} - return action def button_install_cancel(self, cr, uid, ids, context=None): self.write(cr, uid, ids, {'state': 'uninstalled', 'demo':False})