From 249117a25c468d1595ac672142ca197c0fff76b8 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Thu, 30 Jun 2011 16:09:10 +0530 Subject: [PATCH 1/2] [FIX]: res.config: Fixed problem of passing "user" in the context of action to the client as it gives traceback in client, so, after using that res_id from context, we need to remove that from the context bzr revid: rpa@tinyerp.com-20110630103910-ge5x1o5okreyvnx0 --- openerp/addons/base/ir/ir_actions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index 98770ed1ad9..2577c2cf475 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -850,7 +850,8 @@ class ir_actions_todo(osv.osv): user = self.pool.get('res.users').browse(cr, uid, uid, context=context) ctx = eval(res['context'], {'user': user}) if ctx.get('res_id'): - res.update({'res_id': ctx.get('res_id')}) + res.update({'res_id': ctx.pop('res_id')}) + res.update({'context': ctx}) return res def action_open(self, cr, uid, ids, context=None): From ba8fd3884cd2fd0f42d3bd67139e64c84e052dcb Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Thu, 30 Jun 2011 17:17:26 +0530 Subject: [PATCH 2/2] [FIX]: res.config: fixed problem of wizard stays in a background even if we call next wizard bzr revid: rpa@tinyerp.com-20110630114726-42uphvk2cwlgia6x --- openerp/addons/base/res/res_config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 30f06e4c17b..89f197ba68a 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -106,7 +106,9 @@ class res_config_configurable(osv.osv_memory): next = self._next_action(cr, uid) self.__logger.info('next action is %s', next) if next: - return next.action_launch(context=context) + res = next.action_launch(context=context) + res.update({'nodestroy': False}) + return res self.__logger.info('all configuration actions have been executed') current_user_menu = self.pool.get('res.users').browse(cr, uid, uid).menu_id