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 4aabb2dc0b2..fb9528c8c4e 100644 --- a/addons/event/report/event_event_templates.xml +++ b/addons/event/report/event_event_templates.xml @@ -17,18 +17,21 @@
- - + 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}'/> +
+
+ ()
@@ -38,7 +41,7 @@

John Doe

-
@@ -115,18 +118,19 @@ Event Ticket For
- - + 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}'/> + ()
@@ -135,7 +139,7 @@
John Doe
-
@@ -184,7 +188,7 @@ - +
@@ -225,7 +229,7 @@ - +
@@ -233,11 +237,11 @@ - + - + diff --git a/addons/event/views/event_ticket_views.xml b/addons/event/views/event_ticket_views.xml index 2626467fdf7..40907d9e17e 100644 --- a/addons/event/views/event_ticket_views.xml +++ b/addons/event/views/event_ticket_views.xml @@ -120,11 +120,11 @@
- +
- reserved + unconfirmed + reserved + unconfirmed
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml index 8ba971723b1..b140429a001 100644 --- a/addons/event/views/event_views.xml +++ b/addons/event/views/event_views.xml @@ -364,15 +364,15 @@
-
+
- - + +
-
+
- +
@@ -380,18 +380,18 @@
-
+
- Expected attendees + Expected attendees
@@ -666,7 +666,7 @@
- +
diff --git a/addons/event_booth/data/mail_templates.xml b/addons/event_booth/data/mail_templates.xml index 5471d54ce1a..b5b7e41c37c 100644 --- a/addons/event_booth/data/mail_templates.xml +++ b/addons/event_booth/data/mail_templates.xml @@ -7,31 +7,31 @@

Booth - + - + + t-out="booth.partner_id.name or booth.env.user.partner_id.name"/>

  • - Renter Name: + Renter Name:
  • - Renter Email: + Renter Email:
  • - Renter Mobile: + Renter Mobile:
  • - Renter Phone: + Renter Phone:
diff --git a/addons/event_sale/data/mail_data.xml b/addons/event_sale/data/mail_data.xml index 79ad7a392a0..c1c0cdf13e5 100644 --- a/addons/event_sale/data/mail_data.xml +++ b/addons/event_sale/data/mail_data.xml @@ -5,15 +5,15 @@

Registration modification for attendee: - . + . Manual actions may be needed.

Exception:

  • - : - Ticket changed from to + : + Ticket changed from to
diff --git a/addons/event_sale/report/event_event_templates.xml b/addons/event_sale/report/event_event_templates.xml index f891b1c9257..33f3b239ab7 100644 --- a/addons/event_sale/report/event_event_templates.xml +++ b/addons/event_sale/report/event_event_templates.xml @@ -10,7 +10,7 @@
Order Date
-
+
Price
diff --git a/addons/event_sale/views/event_ticket_views.xml b/addons/event_sale/views/event_ticket_views.xml index c489df13765..5a7bae91ee7 100644 --- a/addons/event_sale/views/event_ticket_views.xml +++ b/addons/event_sale/views/event_ticket_views.xml @@ -75,10 +75,10 @@ -
+
-
+
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 0127e38d6a9..e5dc652052d 100644 --- a/addons/website_event/views/event_templates_list.xml +++ b/addons/website_event/views/event_templates_list.xml @@ -54,14 +54,14 @@
@@ -207,7 +210,7 @@ - +
diff --git a/addons/website_event/views/event_templates_page_registration.xml b/addons/website_event/views/event_templates_page_registration.xml index ef94ee46210..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 - + ()
- - @@ -89,8 +90,8 @@
-
-
+
+
@@ -126,7 +127,7 @@
Full
-

+

Unpublished
@@ -134,11 +135,11 @@
-   +   participant(s) -
+
@@ -177,7 +178,11 @@
Room creation will be available when event starts at - + + + () +

diff --git a/addons/website_event_meet/views/event_meet_templates_page.xml b/addons/website_event_meet/views/event_meet_templates_page.xml index f5e03acbfff..344374b0c09 100644 --- a/addons/website_event_meet/views/event_meet_templates_page.xml +++ b/addons/website_event_meet/views/event_meet_templates_page.xml @@ -34,15 +34,15 @@
- The event is over. + The event is over.
- Join us next time to chat about ! + Join us next time to chat about !
- The event + The event starts in - a few seconds @@ -51,10 +51,10 @@ starts on (). + t-options="{'format': 'medium'}"/> ().
- Join us there to chat about ! + Join us there to chat about !
@@ -86,9 +86,9 @@
-
+
- A chat among + A chat among

@@ -114,14 +114,14 @@
-
- +
+
⚬  - +
- +
diff --git a/addons/website_event_meet_quiz/views/event_meet_templates.xml b/addons/website_event_meet_quiz/views/event_meet_templates.xml index a2d0dbbaec4..68f2c78b259 100644 --- a/addons/website_event_meet_quiz/views/event_meet_templates.xml +++ b/addons/website_event_meet_quiz/views/event_meet_templates.xml @@ -19,19 +19,19 @@ diff --git a/addons/website_event_questions/views/event_templates.xml b/addons/website_event_questions/views/event_templates.xml index f9218de26d9..db2d8bd2fb4 100644 --- a/addons/website_event_questions/views/event_templates.xml +++ b/addons/website_event_questions/views/event_templates.xml @@ -31,14 +31,14 @@ 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 375d5a4538f..cfc0c6380d5 100644 --- a/addons/website_event_track/views/event_track_templates_page.xml +++ b/addons/website_event_track/views/event_track_templates_page.xml @@ -34,10 +34,10 @@
- Event + Event starts in - a few seconds @@ -46,7 +46,8 @@ starts on + t-options="{'format': 'medium', 'tz_name': track.event_id.date_tz, 'hide_seconds': 'True'}"/> + ()
@@ -59,12 +60,12 @@
- +
+ t-out="tag.name"/>
@@ -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}'/> - () + () @@ -109,9 +110,9 @@
- + -  at  +  at  @@ -157,7 +158,7 @@ - +
@@ -198,9 +199,9 @@
- +
You - +
- xp + xp