odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]: base_calendar: Fixed problem of generator in recurrent dates 

bzr revid: rpa@tinyerp.com-20100706054247-cjk4v6mq3auql85q
This commit is contained in:
rpa (Open ERP) 2010-07-06 11:12:47 +05:30
parent ff816ebc87
commit 70a9cac130
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/base_calendar/base_calendar.py
View File

@ -60,7 +60,7 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=None):
if exrule:
rset1.exrule(rrule.rrulestr(str(exrule), dtstart=startdate))
return rset1._iter()
return list(rset1._iter())
def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
"""
@ -822,6 +822,8 @@ class calendar_alarm(osv.osv):
delta = alarm.trigger_occurs == 'after' and delta or -delta
for rdate in recurrent_dates:
if rdate + delta > current_datetime:
break
if rdate + delta <= current_datetime:
re_dates.append(rdate.strftime("%Y-%m-%d %H:%M:%S"))
rest_dates = recurrent_dates[len(re_dates):]