From d74fe36654c2f879a4cb04cb990488c55149a991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Mon, 10 Sep 2018 15:27:27 +0200
Subject: [PATCH] [IMP] hr: do not reset employee timezone if user has no
 timezone

Purpose of this code is to synchronize user and employee timezones. However
if the employee has one and the user none it is better to keep the one
set on the employee to avoid issues.
---
 addons/hr/models/hr.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/hr/models/hr.py b/addons/hr/models/hr.py
index 06437298ed5..5dec2fcd1bf 100644
--- a/addons/hr/models/hr.py
+++ b/addons/hr/models/hr.py
@@ -235,12 +235,14 @@ class Employee(models.Model):
             self.tz = self.resource_calendar_id.tz
 
     def _sync_user(self, user):
-        return dict(
+        vals = dict(
             name=user.name,
             image=user.image,
             work_email=user.email,
-            tz=user.tz,
         )
+        if user.tz:
+            vals['tz'] = user.tz
+        return vals
 
     @api.model
     def create(self, vals):