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

[MERGE] [FIX] base_calendar: do not add offset symbol to end_date when computing rrule 

Fix issue when recurrent event (repeat until specified date) with reminder, would fail comparing naive and offset-aware datetimes

lp bug: https://launchpad.net/bugs/1191399 fixed

bzr revid: mat@openerp.com-20140325105848-m886oa9ys0fhb0ju
This commit is contained in:
Martin Trigaux 2014-03-25 11:58:48 +01:00
parent 6d60e0ee29 46e89d6dd1
commit c6f19b6d0d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/base_calendar/base_calendar.py
View File

@ -1325,7 +1325,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
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 '')