Merge lp:~openerp-dev/openobject-addons/7.0-opw-593929-msh into lp:openobject-addons/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of rrule(recurrent rule) string, which adds Z at the end of rrule when recurrent rule created based on End Date, Z is added for timezone by default to UTC, but it is not required as we are sending static time 23:59:59, and rrule of dateutil not going to change the timezone, untill if you specifically provided tzinfo or timezone difference valuelike +03:00 explicitly.

Demo:- Got o Messaging -> Organizer -> Calendar -> Create one event with recurrent rule, and set recurrent rule, Until End date and give any end date.

Now check Scheduled Actions -> Run Event Reminder which calls do_run_scheduler method of calendar.alarm at every 1 minute, and check for the reminder, compute_rule_string based on month, week or end date, if there is rrule is based on end date then we added Z at the end of UNTIL attribute, now when this rrule going to parse by dateutil parser it fails to compare start date(which is with tzinfo in UTC format) and one with tzinfo that is our End date(given in UNTIL) due to which job fails to run.

There is no need of 'Z' as we passing static time and if dateutil parser modifies the time when explicitly tzinfo given other UNTIL date keeps as it is, so removed 'Z' from the rrule, correct me if I am wrong.

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Martin Trigaux (OpenERP) (mat-openerp)]

LGTM, merged in 7.0

revno: 9929 [merge]
revision-id: <email address hidden>

review: Approve

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2013-06-20 13:21:32 +0000
+++ base_calendar/base_calendar.py	2013-06-28 07:26:46 +0000
@@ -1269,7 +1269,7 @@
 
         def get_end_date(data):
             if data.get('end_date'):
-                data['end_date_new'] = ''.join((re.compile('\d')).findall(data.get('end_date'))) + 'T235959Z'
+                data['end_date_new'] = ''.join((re.compile('\d')).findall(data.get('end_date'))) + 'T235959'
 
             return (data.get('end_type') == 'count' and (';COUNT=' + str(data.get('count'))) or '') +\
                              ((data.get('end_date_new') and data.get('end_type') == 'end_date' and (';UNTIL=' + data.get('end_date_new'))) or '')