diff options
| author | XavierDo <xdo@odoo.com> | 2018-07-03 11:17:58 +0200 |
|---|---|---|
| committer | XavierDo <xdo@odoo.com> | 2018-07-11 10:11:14 +0200 |
| commit | dea80d7c9c7c0d93b1240e66a42403d44c738c8d (patch) | |
| tree | f5804d67fae1a5a51e01b503d527e9e98bf1259b | |
| parent | f74f5edc7778a3afacc454c31993ac8502d3d0ee (diff) | |
[FIX] calendar: take user timezone into account for todays meeting
The end of day depends of the user timezone.
Task: #1858076
PR: #25544
| -rw-r--r-- | addons/calendar/models/res_users.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/addons/calendar/models/res_users.py b/addons/calendar/models/res_users.py index 4d8cc0dd8e7..c0b1f1b4a44 100644 --- a/addons/calendar/models/res_users.py +++ b/addons/calendar/models/res_users.py @@ -4,15 +4,22 @@ import datetime from odoo import api, fields, models, modules, _ +from pytz import timezone, UTC class Users(models.Model): _inherit = 'res.users' def _systray_get_calendar_event_domain(self): + tz = self.env.user.tz start_dt = datetime.datetime.utcnow() - start_date = datetime.date.today() + if tz: + start_date = timezone(tz).localize(start_dt).astimezone(UTC).date() + else: + start_date = datetime.date.today() end_dt = datetime.datetime.combine(start_date, datetime.time.max) + if tz: + end_dt = timezone(tz).localize(end_dt).astimezone(UTC) return ['&', '|', '&', |
