[FIX] do_load_state: highlight right menu when loading action using xmlid

bzr revid: chs@openerp.com-20121113140002-gq330rwod0c7qf5m

1 files changed, 6 insertions, 2 deletions

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 53132e454d1..55ddeeaf8c4 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -213,8 +213,12 @@ instance.web.ActionManager = instance.web.Widget.extend({
                 if (run_action) {
                     this.null_action();
                     action_loaded = this.do_action(state.action);
-                    instance.webclient.menu.has_been_loaded.done(function() {
-                        instance.webclient.menu.open_action(state.action);
+                    $.when(action_loaded || null).done(function() {
+                        instance.webclient.menu.has_been_loaded.done(function() {
+                            if (self.inner_action && self.inner_action.id) {
+                                instance.webclient.menu.open_action(self.inner_action.id);
+                            }
+                        });
                     });
                 }
             }