From 0826340b8a761bec3ca5279a9537d8738f40ae1d Mon Sep 17 00:00:00 2001 From: Kersten Jeremy Date: Fri, 9 May 2014 14:31:21 +0200 Subject: [PATCH] [FIX] Event - Don't update the context but a copy when we recompute dates with the timezone specified for the event. bzr revid: jke@openerp.com-20140509123121-xchv133t7gh0e5nh --- addons/event/event.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index 9d86b6cc4e3..8021cce19ae 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -155,15 +155,13 @@ class event_event(osv.osv): if context is None: context = {} res = {} - - print ids for event in self.browse(cr, uid, ids, context=context): - res[event.id] = {} - context['tz'] = event.date_tz or 'UTC' + ctx = dict(context, tz=(event.date_tz or 'UTC')) if fld == 'date_begin_located': - res[event.id] = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date_begin, DEFAULT_SERVER_DATETIME_FORMAT), context=context) + date_to_convert = event.date_begin elif fld == 'date_end_located': - res[event.id] = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date_end, DEFAULT_SERVER_DATETIME_FORMAT), context=context) + date_to_convert = event.date_end + res[event.id] = fields.datetime.context_timestamp(cr, uid, datetime.strptime(date_to_convert, DEFAULT_SERVER_DATETIME_FORMAT), context=ctx) return res def _tz_get(self, cr, uid, context=None):