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

[FIX] calendar: avoid infinite recurrent event 

Old check was always ignored since 0 is False.

This commit closes #12715

Other fix; when we detach an event, we reset the rrule_type to avoid to have a
warning popup (about empty final_date) if the old one value was end_date.
This commit is contained in:
Jeremy Kersten 2016-07-25 14:39:16 +02:00
parent 8245c1d1d8
commit 3418b9f8aa
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/calendar/calendar.py
View File

@ -1267,7 +1267,7 @@ class calendar_event(osv.Model):
"""
if data['interval'] and data['interval'] < 0:
raise osv.except_osv(_('warning!'), _('interval cannot be negative.'))
if data['count'] and data['count'] <= 0:
if data['end_type'] == 'count' and int(data['count']) <= 0:
raise osv.except_osv(_('warning!'), _('count cannot be negative or 0.'))
def get_week_string(freq, data):
@ -1537,6 +1537,7 @@ class calendar_event(osv.Model):
recurrent_id=real_event_id,
recurrent_id_date=data.get('start'),
rrule_type=False,
end_type=False,
rrule='',
recurrency=False,
final_date=datetime.strptime(data.get('start'), DEFAULT_SERVER_DATETIME_FORMAT if data['allday'] else DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(hours=values.get('duration', False) or data.get('duration'))