diff --git a/addons/event/data/mail_template_data.xml b/addons/event/data/mail_template_data.xml index 3e4fbd0bebc..14e65bc2ada 100644 --- a/addons/event/data/mail_template_data.xml +++ b/addons/event/data/mail_template_data.xml @@ -126,7 +126,7 @@
From May 4, 2021, 7:00:00 AM
To May 6, 2021, 5:00:00 PM
-
TZ Europe/Brussels
+
(Europe/Brussels)
@@ -353,7 +353,7 @@
From May 4, 2021, 7:00:00 AM
To May 6, 2021, 5:00:00 PM
-
TZ Europe/Brussels
+
Europe/Brussels
diff --git a/addons/event/models/event_event.py b/addons/event/models/event_event.py index cd4b33c864e..6458f4e6177 100644 --- a/addons/event/models/event_event.py +++ b/addons/event/models/event_event.py @@ -581,8 +581,8 @@ class EventEvent(models.Model): cal_event = cal.add('vevent') cal_event.add('created').value = fields.Datetime.now().replace(tzinfo=pytz.timezone('UTC')) - cal_event.add('dtstart').value = fields.Datetime.from_string(event.date_begin).replace(tzinfo=pytz.timezone('UTC')) - cal_event.add('dtend').value = fields.Datetime.from_string(event.date_end).replace(tzinfo=pytz.timezone('UTC')) + cal_event.add('dtstart').value = event.date_begin.astimezone(pytz.timezone(event.date_tz)) + cal_event.add('dtend').value = event.date_end.astimezone(pytz.timezone(event.date_tz)) cal_event.add('summary').value = event.name if event.address_id: cal_event.add('location').value = event.sudo().address_id.contact_address diff --git a/addons/event/report/event_event_templates.xml b/addons/event/report/event_event_templates.xml index ba447e42c51..fb9528c8c4e 100644 --- a/addons/event/report/event_event_templates.xml +++ b/addons/event/report/event_event_templates.xml @@ -21,14 +21,17 @@ class="font-weight-bold"/> + t-options='{"widget": "datetime", "time_only": True, "tz_name": event.date_tz, "hide_seconds": True}'/> + t-options='{"widget": "datetime", "time_only": True, "tz_name": event.date_tz, "hide_seconds": True}'/> + +
+ ()
@@ -119,14 +122,15 @@ class="font-weight-bold"/> + t-options='{"widget": "datetime", "time_only": True, "hide_seconds": True, "tz_name": event.date_tz}'/> + t-options='{"widget": "datetime", "time_only": True, "hide_seconds": True, "tz_name": event.date_tz}'/> + ()
diff --git a/addons/website_event/models/event_event.py b/addons/website_event/models/event_event.py index 9cfa57d2fab..4e28ef71678 100644 --- a/addons/website_event/models/event_event.py +++ b/addons/website_event/models/event_event.py @@ -7,7 +7,7 @@ from dateutil.relativedelta import relativedelta import json import werkzeug.urls -from pytz import utc +from pytz import utc, timezone from odoo import api, fields, models, _ from odoo.addons.http_routing.models.ir_http import slug @@ -407,12 +407,13 @@ class Event(models.Model): return super(Event, self)._track_subtype(init_values) def _get_event_resource_urls(self): - url_date_start = self.date_begin.strftime('%Y%m%dT%H%M%SZ') - url_date_stop = self.date_end.strftime('%Y%m%dT%H%M%SZ') + url_date_start = self.date_begin.astimezone(timezone(self.date_tz)).strftime('%Y%m%dT%H%M%S') + url_date_stop = self.date_end.astimezone(timezone(self.date_tz)).strftime('%Y%m%dT%H%M%S') params = { 'action': 'TEMPLATE', 'text': self.name, 'dates': url_date_start + '/' + url_date_stop, + 'ctz': self.date_tz, 'details': self.name, } if self.address_id: diff --git a/addons/website_event/views/event_templates_list.xml b/addons/website_event/views/event_templates_list.xml index 3980c514b20..e5dc652052d 100644 --- a/addons/website_event/views/event_templates_list.xml +++ b/addons/website_event/views/event_templates_list.xml @@ -198,8 +198,11 @@
diff --git a/addons/website_event/views/event_templates_page_registration.xml b/addons/website_event/views/event_templates_page_registration.xml index 12cbe04c118..26bea969048 100644 --- a/addons/website_event/views/event_templates_page_registration.xml +++ b/addons/website_event/views/event_templates_page_registration.xml @@ -50,8 +50,10 @@ + () + ()
@@ -59,9 +61,8 @@
End - + ()
- -
@@ -228,10 +229,12 @@ Registration - Sales end on + + Sales end on - + () @@ -366,6 +369,7 @@
+ ()
@@ -374,6 +378,7 @@
+ ()
diff --git a/addons/website_event_exhibitor/controllers/website_event_main.py b/addons/website_event_exhibitor/controllers/website_event_main.py index 20364861f37..f94e21d934a 100644 --- a/addons/website_event_exhibitor/controllers/website_event_main.py +++ b/addons/website_event_exhibitor/controllers/website_event_main.py @@ -15,7 +15,7 @@ class WebsiteEventController(main.WebsiteEventController): if "from_sponsor_id" in post and not event.is_ongoing: sponsor = request.env["event.sponsor"].browse(int(post["from_sponsor_id"])).exists() if sponsor: - date_begin = format_datetime(event.with_context(tz=event.date_tz).date_begin, format="medium") + date_begin = format_datetime(event.date_begin, format="medium", tzinfo=event.date_tz) values["toast_message"] = ( _('The event %s starts on %s (%s). \nJoin us there to meet %s !') diff --git a/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml b/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml index 8d8e4702b70..9365bd9de0b 100644 --- a/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml +++ b/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml @@ -65,9 +65,9 @@ Oops! This room is currently closed
Come back between - + - - + () to meet them !
@@ -117,10 +117,10 @@
Available from - + - - - + + ()
diff --git a/addons/website_event_meet/controllers/website_event_main.py b/addons/website_event_meet/controllers/website_event_main.py index 8d75d58a39e..beb186ddb7a 100644 --- a/addons/website_event_meet/controllers/website_event_main.py +++ b/addons/website_event_meet/controllers/website_event_main.py @@ -15,7 +15,7 @@ class WebsiteEventController(main.WebsiteEventController): if "from_room_id" in post and not event.is_ongoing: meeting_room = request.env["event.meeting.room"].browse(int(post["from_room_id"])).sudo().exists() if meeting_room and meeting_room.is_published: - date_begin = format_datetime(event.with_context(tz=event.date_tz).date_begin, format="medium") + date_begin = format_datetime(event.date_begin, format="medium", tzinfo=event.date_tz) values["toast_message"] = ( _('The event %s starts on %s (%s). \nJoin us there to chat about "%s" !') diff --git a/addons/website_event_meet/views/event_meet_templates_list.xml b/addons/website_event_meet/views/event_meet_templates_list.xml index 857017e5dfa..39e4750a18e 100644 --- a/addons/website_event_meet/views/event_meet_templates_list.xml +++ b/addons/website_event_meet/views/event_meet_templates_list.xml @@ -75,6 +75,7 @@ This room is not open right now!
Join us here on the + () to have a chat with us! @@ -177,7 +178,11 @@
Room creation will be available when event starts at - + + + () +
diff --git a/addons/website_event_track/views/event_track_templates_agenda.xml b/addons/website_event_track/views/event_track_templates_agenda.xml index 84ded51524b..799ee8de6eb 100644 --- a/addons/website_event_track/views/event_track_templates_agenda.xml +++ b/addons/website_event_track/views/event_track_templates_agenda.xml @@ -84,6 +84,9 @@ +
+ () +
tracks diff --git a/addons/website_event_track/views/event_track_templates_list.xml b/addons/website_event_track/views/event_track_templates_list.xml index 2bb11fbfda1..977fe236d5b 100644 --- a/addons/website_event_track/views/event_track_templates_list.xml +++ b/addons/website_event_track/views/event_track_templates_list.xml @@ -182,6 +182,9 @@ +
+ () +
+ class="float-right d-none d-md-block ml-2 py-1"> @@ -214,7 +217,7 @@
+ class="float-right d-block d-md-none ml-2 py-1"> @@ -251,7 +254,7 @@ + t-options="{'widget': 'datetime', 'time_only': True, 'format': 'short', 'tz_name': track.event_id.date_tz}"/> Finished
@@ -265,7 +268,7 @@
-
+
@@ -280,7 +283,7 @@ + t-options="{'widget': 'datetime', 'time_only': True, 'format': 'short', 'tz_name': event.date_tz}"/> Finished
diff --git a/addons/website_event_track/views/event_track_templates_page.xml b/addons/website_event_track/views/event_track_templates_page.xml index f37a3595517..cfc0c6380d5 100644 --- a/addons/website_event_track/views/event_track_templates_page.xml +++ b/addons/website_event_track/views/event_track_templates_page.xml @@ -46,7 +46,8 @@ starts on + t-options="{'format': 'medium', 'tz_name': track.event_id.date_tz, 'hide_seconds': 'True'}"/> + ()
@@ -85,12 +86,12 @@ + t-options='{"hide_seconds":"True", "format": "short", "tz_name": event.date_tz}'/> - + t-options='{"hide_seconds":"True", "format": "short", "tz_name": event.date_tz}'/> - () + ()