[MERGE] base_calendar: fix in argument passing to get_recurrent_dates method (a list was needed, a string was passed)
bzr revid: qdp-launchpad@openerp.com-20130404160429-lz97n2fgspcstm6k
This commit is contained in:
commit
11fd8eba26
|
@ -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':
|
||||
|
|
Loading…
Reference in New Issue