diff options
| author | jke-openerp <jke@openerp.com> | 2014-02-18 12:42:12 +0100 |
|---|---|---|
| committer | jke-openerp <jke@openerp.com> | 2014-02-18 12:42:12 +0100 |
| commit | cbf55efbd52fb251b56936fa91ecac8dfdb3bc57 (patch) | |
| tree | 0086399dbe57b20c3846a04164f5f1fa858535f1 | |
| parent | 099c2710b193b46218f3b3fc7c933dfca57bc21c (diff) | |
[TYPO] Remove strptime inserted by error in last commit
bzr revid: jke@openerp.com-20140218114212-lbxfceagz51kj1eb
| -rw-r--r-- | addons/calendar/calendar.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |
