[FIX]base_calendar: when running scheduler for alarm, the argument exdate should...
authorCedric Snauwaert <csn@openerp.com>
Fri, 29 Mar 2013 15:02:01 +0000 (16:02 +0100)
committerCedric Snauwaert <csn@openerp.com>
Fri, 29 Mar 2013 15:02:01 +0000 (16:02 +0100)
bzr revid: csn@openerp.com-20130329150201-tlcflrzdrd8v3wiq

addons/base_calendar/base_calendar.py

index ab0d8d3..25bfcac 100644 (file)
@@ -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':