summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-05-02 13:16:27 +0200
committerChristophe Simonis <chs@odoo.com>2019-05-02 13:16:27 +0200
commit3ca58705c98f5976efecfdcd20ae603dc9ecbbe1 (patch)
treeb4503ca7b2612ff8dafa761dc824452ce1de020a /addons/web/static/src
parent848a1b970bd493363b29883c0c20c55c820d04ee (diff)
parent2c68df0ab43cb42e6762d7a1929471bf3f3df920 (diff)
[MERGE] forward port branch saas-11.3 up to 2c68df0ab43
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views/calendar/calendar_model.js3
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 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())