summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2012-04-25 12:11:50 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2012-04-25 12:11:50 +0200
commit16aeaacf8430e00d907802eba0f95b59de2e9c73 (patch)
tree1db5783d016fbbb18cb0798f7c48ea354c276db4 /addons/web/static/src
parent295db6bb7f4eb9f661a0b4ae8e962af03da7824d (diff)
[fix] problem in chart of account wizard
lp bug: https://launchpad.net/bugs/944109 fixed bzr revid: nicolas.vanhoren@openerp.com-20120425101150-96ry93s16sbgdn3w
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 7579de3dc36..798c5bb1493 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -140,13 +140,13 @@ instance.web.ActionManager = instance.web.Widget.extend({
this.dialog_viewmanager.appendTo(this.dialog.$element);
this.dialog.open();
} else {
+ this.dialog_stop();
+ this.content_stop();
if(action.menu_id) {
return this.getParent().do_action(action, function () {
instance.webclient.menu.open_menu(action.menu_id);
});
}
- this.dialog_stop();
- this.content_stop();
this.inner_action = action;
this.inner_viewmanager = new instance.web.ViewManagerAction(this, action);
this.inner_viewmanager.appendTo(this.$element);