[MERGE] forward port branch 12.0 up to d7c0c5c127b

2 files changed, 4 insertions, 1 deletions

diff --git a/addons/web/static/src/js/tools/debug_manager.js b/addons/web/static/src/js/tools/debug_manager.js
index f09d8745f04..7c5fd390871 100644
--- a/addons/web/static/src/js/tools/debug_manager.js
+++ b/addons/web/static/src/js/tools/debug_manager.js
@@ -433,6 +433,7 @@ DebugManager.include({
         var fields = state.fields;
         var fieldsInfo = state.fieldsInfo.form;
         var fieldNamesInView = state.getFieldNames();
+        var fieldNamesOnlyOnView = ['message_attachment_count'];
         var fieldsValues = state.data;
         var modifierDatas = {};
         _.each(fieldNamesInView, function (fieldName) {
@@ -441,6 +442,7 @@ DebugManager.include({
             });
         });
         this.fields = _.chain(fieldNamesInView)
+            .difference(fieldNamesOnlyOnView)
             .map(function (fieldName) {
                 var modifierData = modifierDatas[fieldName];
                 var invisibleOrReadOnly;
diff --git a/addons/web/static/src/js/views/calendar/calendar_model.js b/addons/web/static/src/js/views/calendar/calendar_model.js
index 2b771ba9772..782f31a1bd2 100644
--- a/addons/web/static/src/js/views/calendar/calendar_model.js
+++ b/addons/web/static/src/js/views/calendar/calendar_model.js
@@ -60,10 +60,11 @@ return AbstractModel.extend({
             end.add(-1, 'days');
         }
 
+        var isDateEvent = this.fields[this.mapping.date_start].type === 'date';
         // An "allDay" event without the "all_day" option is not considered
         // as a 24h day. It's just a part of the day (by default: 7h-19h).
         if (event.allDay) {
-            if (!this.mapping.all_day) {
+            if (!this.mapping.all_day && !isDateEvent) {
                 if (event.r_start) {
                     start.hours(event.r_start.hours())
                          .minutes(event.r_start.minutes())