Merge lp:~openerp-dev/openobject-addons/6.1-opw-575176-bth into lp:openobject-addons/6.1

[Bhumi Thakkar (Open ERP)]

Hello,

     Click on meeting error is coming in command prompt 'day is out of range for month' and 'TypeError: can't compare offset-naive and offset-aware datetimes'.

1. Sales => Meetings => Meetings
2. Open any meeting and set reminder.

Observed: Error is coming in command prompt 'day is out of range for month' and meetings can not open.
Expected: 'Meetings should open without any error.'

'day is out of range for month' this error is coming because date should pass in list so passed in list. This error is solved but another error is coming 'TypeError: can't compare offset-naive and offset-aware datetimes'.

when rrule contains UNTIL keyword then should parse value of until keyword with datetime and set untildate. which is not done when passed value in get_recurrent_dates () function from do_run_scheduler () in base_calendar.py file.

Thanks.

[lp:~openerp-dev/openobject-addons/6.1-opw-575176-bth]

6865. By Xavier ALT on 2012-08-10

[FIX] base_calendar: enforce 'UNTIL' limit on recurrent rules

 - if recurrent rules doesn't defined an UNTIL value, we enforce it to TODAY + 150 years.
   We have to enforce a limit for rrule calculation otherwise we will never ends (until = forever)

 - on 'get_recurrrent_ids' we enforce 'UNTIL' depending on requested domain. If use requested
   reccurent values for date between '2012-01-01' and '2012-12-21' we do not need to compute
   values later than requested upper limit (here: until = '2012-12-22')
   NOTE: added one extra day of to be sure handling of '>=' will be timezone safe.

6866. By Xavier ALT on 2012-08-10

[FIX] base_calendar: get_recurrent_ids() have to respect provided 'limit'

6867. By Xavier ALT on 2012-08-10

[FIX] base_calendar: fix stupid condition error - check for upper bound if domain ask for date before _

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Reproducible on Trunk . If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6867. By Xavier ALT on 2012-08-10

[FIX] base_calendar: fix stupid condition error - check for upper bound if domain ask for date before _

6866. By Xavier ALT on 2012-08-10

[FIX] base_calendar: get_recurrent_ids() have to respect provided 'limit'

6865. By Xavier ALT on 2012-08-10

[FIX] base_calendar: enforce 'UNTIL' limit on recurrent rules

 - if recurrent rules doesn't defined an UNTIL value, we enforce it to TODAY + 150 years.
   We have to enforce a limit for rrule calculation otherwise we will never ends (until = forever)

 - on 'get_recurrrent_ids' we enforce 'UNTIL' depending on requested domain. If use requested
   reccurent values for date between '2012-01-01' and '2012-12-21' we do not need to compute
   values later than requested upper limit (here: until = '2012-12-22')
   NOTE: added one extra day of to be sure handling of '>=' will be timezone safe.

6864. By Bhumi Thakkar (Open ERP) on 2012-06-28

[FIX] if rule contains UNTIL keyword then parse value with time and set rrule_until_date.

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2012-03-05 14:35:54 +0000
+++ base_calendar/base_calendar.py	2012-08-10 11:11:20 +0000
@@ -63,8 +63,47 @@
     if exrule:
         rset1.exrule(rrule.rrulestr(str(exrule), dtstart=startdate))
 
+    # FIXME: no API-break rule won't permit to remove that list() cast, but this
+    #        should be a good idea as rruleset is iterable we don't need that case
+    #        (will help reducing memory usage for big rrule end dates)
     return list(rset1)
 
+def get_recurrent_dates_max_limit():
+    """ return the maximum date we should consider for last recurrent event date """
+    # even with extension of lifetime, 150 years should be a good maximum...
+    return datetime.now(tz=pytz.timezone('UTC')) + relativedelta(years=150)
+
+def force_recurrent_dates_until(rrulestring, until_max=None):
+    """
+    Enforce recurrent rule UNTIL to be present
+    @param rrulestring: Rulestring
+    @param until_max: Maximum reccurent date or TODAY + X years if None
+    @return: New reccurrent rule string
+    """
+    if until_max is None:
+        until_max = get_recurrent_dates_max_limit()
+    new_rrulestring = []
+    is_until = False
+    for rule in rrulestring.split(';'):
+        name, value = rule.split('=')
+        if name == "UNTIL":
+            is_until = True
+            value = parser.parse(value)
+            # take earliest until limit between the one from event and maximum date
+            value = min(value, until_max)
+            value = value.strftime("%Y%m%d%H%M%S")
+        new_rule = '%s=%s' % (name, value)
+        new_rrulestring.append(new_rule)
+
+    if not is_until:
+        # there is no upper range time limit, we should really set one
+        # take user-request limit or default data_max_limit
+        is_until = True
+        value = until_max.strftime("%Y%m%d%H%M%S")
+        new_rrulestring.append('%s=%s' % ('UNTIL', value))
+
+    return ';'.join(new_rrulestring)
+
 def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
     """
     This function converts virtual event id into real id of actual event
@@ -830,7 +869,10 @@
 
             if 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 = res_obj.exdate and res_obj.exdate.split(',') or []
+                rrule_str = res_obj.rrule
+                new_rrule_str = force_recurrent_dates_until(rrule_str)
+                recurrent_dates = get_recurrent_dates(str(new_rrule_str), exdate, event_date, res_obj.exrule)
 
                 trigger_interval = alarm.trigger_interval
                 if trigger_interval == 'days':
@@ -1133,22 +1175,27 @@
             if not data['rrule']:
                 continue
 
+            # compute upper max date from domain
+            date_max_limit = None
+            for arg in domain:
+                if arg[0] in ('date', 'date_deadline'):
+                    if arg[1] in ('=','<','<='):
+                        value = arg[2]
+                        if date_max_limit is None or value > date_max_limit:
+                            # increase upper limit
+                            date_max_limit = value
+            # force an upper max data from user-request domain or reasonable max
+            # otherwise we may end compute recurring dates until the ends of life!
+            if date_max_limit:
+                date_max_limit = datetime.strptime(date_max_limit, '%Y-%m-%d')
+                date_max_limit = pytz.timezone('UTC').localize(date_max_limit)
+                date_max_limit += relativedelta(days=1)
+
             exdate = data['exdate'] and data['exdate'].split(',') or []
             rrule_str = data['rrule']
-            new_rrule_str = []
-            rrule_until_date = False
-            is_until = False
-            for rule in rrule_str.split(';'):
-                name, value = rule.split('=')
-                if name == "UNTIL":
-                    is_until = True
-                    value = parser.parse(value)
-                    rrule_until_date = parser.parse(value.strftime("%Y-%m-%d %H:%M:%S"))
-                    value = value.strftime("%Y%m%d%H%M%S")
-                new_rule = '%s=%s' % (name, value)
-                new_rrule_str.append(new_rule)
-            new_rrule_str = ';'.join(new_rrule_str)
+            new_rrule_str = force_recurrent_dates_until(rrule_str, until_max=date_max_limit)
             rdates = get_recurrent_dates(str(new_rrule_str), exdate, event_date, data['exrule'])
+            count = 0
             for r_date in rdates:
                 ok = True
                 for arg in domain:
@@ -1167,6 +1214,9 @@
                     continue
                 idval = real_id2base_calendar_id(data['id'], r_date.strftime("%Y-%m-%d %H:%M:%S"))
                 result.append(idval)
+                if limit and count > limit:
+                    # do not compute more than `limit` number of recurrent dates per event
+                    break
 
         if isinstance(select, (str, int, long)):
             return ids and ids[0] or False