From 2d1bd434ab86835ebc32a7070fa5edd6bbed5923 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 3 May 2012 10:23:40 +0200
Subject: [PATCH 1/2] [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 @@
       </field>
     </record>
 
+    <!-- reload the client; useful when the user menu and/or current view has changed -->
+    <record id="action_reload_all" model="ir.actions.client">
+        <field name="name">Reload Client Interface</field>
+        <field name="tag">reload_all</field>
+    </record>
+
   </data>
 </openerp>

From 2e2b4c533729b56d17177280a49860e61a30ebd1 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 3 May 2012 11:39:41 +0200
Subject: [PATCH 2/2] [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 @@
       </field>
     </record>
 
-    <!-- reload the client; useful when the user menu and/or current view has changed -->
-    <record id="action_reload_all" model="ir.actions.client">
-        <field name="name">Reload Client Interface</field>
-        <field name="tag">reload_all</field>
-    </record>
-
   </data>
 </openerp>