1 files changed, 8 insertions, 0 deletions
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index 0f89396eed2..fbc8a28e375 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -51,9 +51,14 @@ var WidgetButton = common.FormWidget.extend({
     },
     on_click: function() {
         var self = this;
+        if (this.view.is_disabled) {
+            return;
+        }
         this.force_disabled = true;
         this.check_disable();
+        this.view.disable_button();
         this.execute_action().always(function() {
+            self.view.enable_button();
             self.force_disabled = false;
             self.check_disable();
             if (self.$el.hasClass('o_wow')) {
@@ -1499,6 +1504,9 @@ var FieldStatus = common.AbstractField.extend({
     on_click_stage: function (ev) {
         var self = this;
         var $li = $(ev.currentTarget);
+        if (this.view.is_disabled) {
+            return;
+        }
         var val;
         if (this.field.type == "many2one") {
             val = parseInt($li.data("id"), 10);