[MERGE] base_calendar: fixed bug 907644: deleting an event now also unlinks attendees

bzr revid: tde@openerp.com-20120103133246-4ifp7hcko0ao0p3f

diff --cc addons/base_calendar/base_calendar.py
index 265c3bb,c167fb8..d1a1109
--- 1/addons/base_calendar/base_calendar.py
--- 2/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@@ -1486,6 -1486,7 +1486,7 @@@ rule or repeating pattern of time to ex
          if not isinstance(ids, list):
              ids = [ids]
          res = False
 -        calendar_obj=self.pool.get('calendar.attendee')
++        attendee_obj=self.pool.get('calendar.attendee')
          for event_id in ids[:]:
              if len(str(event_id).split('-')) == 1:
                  continue
@@@ -1498,6 -1499,9 +1499,9 @@@
              exdate = (data['exdate'] and (data['exdate'] + ',')  or '') + date_new
              self.write(cr, uid, [real_event_id], {'exdate': exdate})
              ids.remove(event_id)
+         for event in self.browse(cr, uid, ids, context=context):
+             if event.attendee_ids:
 -                calendar_obj.unlink(cr, uid, [x.id for x in event.attendee_ids], context=context)
++                attendee_obj.unlink(cr, uid, [x.id for x in event.attendee_ids], context=context)
  
          res = super(calendar_event, self).unlink(cr, uid, ids, context=context)
          self.pool.get('res.alarm').do_alarm_unlink(cr, uid, ids, self._name)