diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2013-03-29 16:02:01 +0100 |
|---|---|---|
| committer | Cedric Snauwaert <csn@openerp.com> | 2013-03-29 16:02:01 +0100 |
| commit | dd044c571d02fe63cbe699366c06da4c6cd0c5c9 (patch) | |
| tree | 2fcaa007c86fccff259bed9bd1464da15257e036 | |
| parent | f0957681c966f523012f635a3d82610da4bd10aa (diff) | |
[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
| -rw-r--r-- | addons/base_calendar/base_calendar.py | 4 |
1 files changed, 3 insertions, 1 deletions
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': |