From dd044c571d02fe63cbe699366c06da4c6cd0c5c9 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 29 Mar 2013 16:02:01 +0100 Subject: [PATCH] [FIX]base_calendar: when running scheduler for alarm, the argument exdate should be a list and not a string bzr revid: csn@openerp.com-20130329150201-tlcflrzdrd8v3wiq --- addons/base_calendar/base_calendar.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index ab0d8d324b4..25bfcac448c 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -858,7 +858,9 @@ class calendar_alarm(osv.osv): if hasattr(res_obj, 'rrule') and res_obj.rrule: event_date = datetime.strptime(res_obj.date, '%Y-%m-%d %H:%M:%S') - recurrent_dates = get_recurrent_dates(res_obj.rrule, res_obj.exdate, event_date, res_obj.exrule) + #exdate is a string and we need a list + exdate = res_obj.exdate and res_obj.exdate.split(',') or [] + recurrent_dates = get_recurrent_dates(res_obj.rrule, exdate, event_date, res_obj.exrule) trigger_interval = alarm.trigger_interval if trigger_interval == 'days':