diff --git a/addons/calendar/models/mail_activity.py b/addons/calendar/models/mail_activity.py index 43d6743eece..da30c6629d4 100644 --- a/addons/calendar/models/mail_activity.py +++ b/addons/calendar/models/mail_activity.py @@ -39,10 +39,7 @@ class MailActivity(models.Model): return super(MailActivity, self)._action_done(feedback=feedback, attachment_ids=attachment_ids) def unlink_w_meeting(self): - return self.unlink() - - def unlink(self): events = self.mapped('calendar_event_id') - res = super().unlink() + res = self.unlink() events.unlink() return res diff --git a/addons/calendar/tests/test_mail_activity_mixin.py b/addons/calendar/tests/test_mail_activity_mixin.py index 70c5768b10f..c991b407209 100644 --- a/addons/calendar/tests/test_mail_activity_mixin.py +++ b/addons/calendar/tests/test_mail_activity_mixin.py @@ -77,3 +77,6 @@ class TestMailActivityMixin(MailCommon): self.assertEqual(test_record.activity_calendar_event_id.name, ev1.name, "This should be the calendar event of the next activity") act1._action_done(feedback="Mark activity as done with text") + + self.assertFalse(act1.exists(), "activity marked as done should be deleted") + self.assertTrue(ev1.exists(), "event of done activity must not be deleted")