diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2013-04-04 18:04:29 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2013-04-04 18:04:29 +0200 |
| commit | 11fd8eba2694e62fda2c6539ce959cd3387851a8 (patch) | |
| tree | 3597e663ef886224691f7e3c99a994a4241730dd | |
| parent | ec06d3ed54db8290dafeb234e1d129430e0bed26 (diff) | |
| parent | dd044c571d02fe63cbe699366c06da4c6cd0c5c9 (diff) | |
[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
| -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': |