diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-05-02 10:59:21 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-05-02 10:59:21 +0200 |
| commit | 2c68df0ab43cb42e6762d7a1929471bf3f3df920 (patch) | |
| tree | 6b50e22be60152c7d6218d791076fe4a4457bd4e /addons/web/static/src/js/views | |
| parent | b1530265e4b5ef6dc67919154f6827ff36f6aae3 (diff) | |
| parent | 82c901c93797b15ab33b5e784450e147c1bc3ba8 (diff) | |
[MERGE] forward port branch 11.0 up to 82c901c9379
Diffstat (limited to 'addons/web/static/src/js/views')
| -rw-r--r-- | addons/web/static/src/js/views/calendar/calendar_model.js | 3 |
1 files changed, 2 insertions, 1 deletions
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 4ca1b56973e..71290708318 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()) |