From cbf55efbd52fb251b56936fa91ecac8dfdb3bc57 Mon Sep 17 00:00:00 2001 From: jke-openerp Date: Tue, 18 Feb 2014 12:42:12 +0100 Subject: [PATCH] [TYPO] Remove strptime inserted by error in last commit bzr revid: jke@openerp.com-20140218114212-lbxfceagz51kj1eb --- addons/calendar/calendar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index f5bb558e7fd..d42096bbec9 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -891,7 +891,7 @@ class calendar_event(osv.Model): start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S") user = self.pool['res.users'].browse(cr, uid, uid) tz = pytz.timezone(user.tz) if user.tz else pytz.utc - start = pytz.utc.localize(datetime.strptime(start)).astimezone(tz) # convert start in user's timezone + start = pytz.utc.localize(start).astimezone(tz) # convert start in user's timezone start = start.astimezone(pytz.utc) # convert start back to utc value['duration'] = 24.0