From dec73a43da9ac407c168ca40d065d5a9768ffdfa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 1 Aug 2014 13:48:33 +0200 Subject: [PATCH] [FIX] calendar: onchange_dates: protect against void dates (for example when creating a meeting through the form view) --- addons/calendar/calendar.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index 1115343..b7f249a 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -983,22 +983,22 @@ class calendar_event(osv.Model): value['allday'] = checkallday # Force to be rewrited if allday: - if fromtype == 'start': + if fromtype == 'start' and start: start = datetime.strptime(start, DEFAULT_SERVER_DATE_FORMAT) value['start_datetime'] = datetime.strftime(start, DEFAULT_SERVER_DATETIME_FORMAT) value['start'] = datetime.strftime(start, DEFAULT_SERVER_DATETIME_FORMAT) - if fromtype == 'stop': + if fromtype == 'stop' and end: end = datetime.strptime(end, DEFAULT_SERVER_DATE_FORMAT) value['stop_datetime'] = datetime.strftime(end, DEFAULT_SERVER_DATETIME_FORMAT) value['stop'] = datetime.strftime(end, DEFAULT_SERVER_DATETIME_FORMAT) else: - if fromtype == 'start': + if fromtype == 'start' and start: start = datetime.strptime(start, DEFAULT_SERVER_DATETIME_FORMAT) value['start_date'] = datetime.strftime(start, DEFAULT_SERVER_DATE_FORMAT) value['start'] = datetime.strftime(start, DEFAULT_SERVER_DATETIME_FORMAT) - if fromtype == 'stop': + if fromtype == 'stop' and end: end = datetime.strptime(end, DEFAULT_SERVER_DATETIME_FORMAT) value['stop_date'] = datetime.strftime(end, DEFAULT_SERVER_DATE_FORMAT) value['stop'] = datetime.strftime(end, DEFAULT_SERVER_DATETIME_FORMAT) -- 1.7.10.4