diff --git a/addons/event/models/event.py b/addons/event/models/event.py index ced20b54b8f..433aaccf7b5 100644 --- a/addons/event/models/event.py +++ b/addons/event/models/event.py @@ -241,7 +241,9 @@ class EventEvent(models.Model): # Need to localize because it could begin late and finish early in # another timezone event = event.with_context(tz=event.date_tz) - event.is_one_day = (event.date_begin.date() == event.date_end.date()) + begin_tz = fields.Datetime.context_timestamp(event, event.date_begin) + end_tz = fields.Datetime.context_timestamp(event, event.date_end) + event.is_one_day = (begin_tz.date() == end_tz.date()) @api.onchange('is_online') def _onchange_is_online(self): diff --git a/addons/event/tests/test_event_flow.py b/addons/event/tests/test_event_flow.py index 7a2364ac4c9..8121528596b 100644 --- a/addons/event/tests/test_event_flow.py +++ b/addons/event/tests/test_event_flow.py @@ -116,6 +116,12 @@ class TestEventFlow(TestEventCommon): def test_event_data(self): self.event_0.write({'registration_ids': [(0, 0, {'partner_id': self.user_eventuser.partner_id.id})]}) self.assertEqual(self.event_0.registration_ids.get_date_range_str(), u'tomorrow') + self.event_0.write({ + 'date_begin': '2019-11-09 14:30:00', + 'date_end': '2019-11-10 00:00:00', + 'date_tz': 'Mexico/General' + }) + self.assertTrue(self.event_0.is_one_day) def test_event_date_range(self): self.event_0.write({'registration_ids': [(0, 0, {'partner_id': self.user_eventuser.partner_id.id})]}) diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index 9f51854ab3c..25b891c6685 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -188,8 +188,8 @@
- - + +
@@ -220,7 +220,7 @@
@@ -433,8 +433,8 @@
Date & Time
- -

+ +

Start - @@ -443,8 +443,8 @@ - -

+ +

End - @@ -534,7 +534,7 @@ - End on + End on