[MERGE] forward port branch saas-16 up to 09d698d05fa

2 files changed, 8 insertions, 5 deletions

diff --git a/addons/web/static/src/js/views/calendar/calendar_renderer.js b/addons/web/static/src/js/views/calendar/calendar_renderer.js
index b61236131c6..4f5719063ff 100644
--- a/addons/web/static/src/js/views/calendar/calendar_renderer.js
+++ b/addons/web/static/src/js/views/calendar/calendar_renderer.js
@@ -330,11 +330,12 @@ return AbstractRenderer.extend({
                 }
                 element.find('.fc-content .fc-time').text(display_hour);
             },
-            height: 'auto',
+            height: 'parent',
             unselectAuto: false,
         });
 
         this.$calendar.fullCalendar(fc_options);
+        window.dispatchEvent(new Event('resize'));
     },
     /**
      * Initialize the mini calendar in the sidebar
diff --git a/addons/web/static/src/js/views/form/form_renderer.js b/addons/web/static/src/js/views/form/form_renderer.js
index fe53bb6cf8a..3674046d5ea 100644
--- a/addons/web/static/src/js/views/form/form_renderer.js
+++ b/addons/web/static/src/js/views/form/form_renderer.js
@@ -114,18 +114,20 @@ var FormRenderer = BasicRenderer.extend({
         });
     },
     /**
-     * Disable stat buttons so that they can't be clicked anymore
+     * Disable statusbar buttons and stat buttons so that they can't be clicked anymore
      *
      */
     disableButtons: function() {
-        this.$('.oe_button_box button').attr('disabled', true);
+        this.$('.o_statusbar_buttons button, .oe_button_box button')
+            .attr('disabled', true);
     },
     /**
-     * Enable stat buttons so they can be clicked again
+     * Enable statusbar buttons and stat buttons so they can be clicked again
      *
      */
     enableButtons: function() {
-        this.$('.oe_button_box button').removeAttr('disabled');
+        this.$('.o_statusbar_buttons button, .oe_button_box button')
+            .removeAttr('disabled');
     },
     /**
      * returns the active tab pages for each notebook