[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
This commit is contained in:
parent
67fb735b50
commit
0826340b8a
|
@ -155,15 +155,13 @@ class event_event(osv.osv):
|
||||||
if context is None:
|
if context is None:
|
||||||
context = {}
|
context = {}
|
||||||
res = {}
|
res = {}
|
||||||
|
|
||||||
print ids
|
|
||||||
for event in self.browse(cr, uid, ids, context=context):
|
for event in self.browse(cr, uid, ids, context=context):
|
||||||
res[event.id] = {}
|
ctx = dict(context, tz=(event.date_tz or 'UTC'))
|
||||||
context['tz'] = event.date_tz or 'UTC'
|
|
||||||
if fld == 'date_begin_located':
|
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':
|
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
|
return res
|
||||||
|
|
||||||
def _tz_get(self, cr, uid, context=None):
|
def _tz_get(self, cr, uid, context=None):
|
||||||
|
|
Loading…
Reference in New Issue