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

[FIX] unlink event traceback 

bzr revid: tfr@openerp.com-20110628090726-6uo0wda3lbhq6nlg
This commit is contained in:
tfr@openerp.com 2011-06-28 11:07:26 +02:00
parent eedefe1ebc
commit b567ed3398
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/base_calendar/base_calendar.py
View File

@ -1430,8 +1430,11 @@ rule or repeating pattern of time to exclude from the recurring rule."),
res = False
for id in ids:
event_datas = self.read(cr, uid, [id], ['date', 'rrule', 'exdate'], context=context)[0]
event_id = event_datas['id']
data_list = self.read(cr, uid, [id], ['date', 'rrule', 'exdate'], context=context)
if len(data_list) < 1:
continue
event_data = data_list[0]
event_id = event_data['id']
if self.get_edit_all(cr, uid, event_id, vals=None):
event_id = base_calendar_id2real_id(event_id)
@ -1443,11 +1446,11 @@ rule or repeating pattern of time to exclude from the recurring rule."),
else:
str_event, date_new = event_id.split('-')
event_id = int(str_event)
if event_datas['rrule']:
if event_data['rrule']:
# Remove one of the recurrent event
date_new = time.strftime("%Y%m%dT%H%M%S", \
time.strptime(date_new, "%Y%m%d%H%M%S"))
exdate = (event_datas['exdate'] and (event_datas['exdate'] + ',') or '') + date_new
exdate = (event_data['exdate'] and (event_data['exdate'] + ',') or '') + date_new
res = self.write(cr, uid, [event_id], {'exdate': exdate})
else:
res = super(calendar_event, self).unlink(cr, uid, [event_id], context=context)