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

[CLEAN] 

bzr revid: tfr@openerp.com-20110408120918-6ysl3ktwjlhnltc2
This commit is contained in:
Thibault Francois 2011-04-08 14:09:18 +02:00
parent cc29e5e5ab d62ed9236f
commit 6280812b27
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/base_calendar/base_calendar.py
View File

@ -1429,7 +1429,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
ids = self.web_client_unfucking_timebomb(ids)
if not isinstance(ids, list):
ids = [ids]
print 'ids', ids
res = False
for id in ids:
event_datas = self.read(cr, uid, [id], ['date', 'rrule', 'exdate'], context=context)[0]
@ -1442,7 +1442,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
if isinstance(event_id, (int, long)):
res = super(calendar_event, self).unlink(cr, uid, event_id, context=context)
self.pool.get('res.alarm').do_alarm_unlink(cr, uid, [event_id], self._name)
print 'unlink real id'
self.unlink_events(cr, uid, [event_id], context=context)
else:
str_event, date_new = event_id.split('-')
@ -1453,9 +1452,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
time.strptime(date_new, "%Y%m%d%H%M%S"))
exdate = (event_datas['exdate'] and (event_datas['exdate'] + ',') or '') + date_new
res = self.write(cr, uid, [event_id], {'exdate': exdate})
print 'exdate', exdate
else:
print "unlink"
res = super(calendar_event, self).unlink(cr, uid, [event_id], context=context)
self.pool.get('res.alarm').do_alarm_unlink(cr, uid, [event_id], self._name)
self.unlink_events(cr, uid, [event_id], context=context)