[MERGE] forward port branch saas-15 up to 8962b8ecc2a

1 files changed, 3 insertions, 1 deletions

diff --git a/addons/website_event_track/controllers/main.py b/addons/website_event_track/controllers/main.py
index 3463ec0b3be..0a592053453 100644
--- a/addons/website_event_track/controllers/main.py
+++ b/addons/website_event_track/controllers/main.py
@@ -67,11 +67,13 @@ class WebsiteEventTrackController(http.Controller):
 
     @http.route(['''/event/<model("event.event", "[('website_track','=',1)]"):event>/agenda'''], type='http', auth="public", website=True)
     def event_agenda(self, event, tag=None, **post):
+        local_tz = pytz.timezone(event.date_tz or 'UTC')
         days_tracks = collections.defaultdict(lambda: [])
         for track in event.track_ids.sorted(lambda track: (track.date, bool(track.location_id))):
             if not track.date:
                 continue
-            days_tracks[track.date[:10]].append(track)
+            date = fields.Datetime.from_string(track.date).replace(tzinfo=pytz.utc).astimezone(local_tz)
+            days_tracks[str(date)[:10]].append(track)
 
         days = {}
         tracks_by_days = {}