From 8385c880d288e4a466f7b59b0ee873c33f161a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 15 Jun 2020 08:23:30 +0000 Subject: [PATCH] [FIX] event: do not set a void timezone from type Synchronize only timezone value from event type if set. Otherwise keep the existing one or fallback on user defined one. Task ID 2244487 PR odoo/odoo#52998 FwdPort of odoo/odoo#52923 X-original-commit: 10094beec786ef0ea6e32e621d4e026fedeba19a --- addons/event/models/event_event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event/models/event_event.py b/addons/event/models/event_event.py index b351f434e12..9de9285ead0 100644 --- a/addons/event/models/event_event.py +++ b/addons/event/models/event_event.py @@ -330,7 +330,7 @@ class EventEvent(models.Model): @api.depends('event_type_id') def _compute_date_tz(self): for event in self: - if event.event_type_id.use_timezone: + if event.event_type_id.use_timezone and event.event_type_id.default_timezone: event.date_tz = event.event_type_id.default_timezone if not event.date_tz: event.date_tz = self.env.user.tz or 'UTC'