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

[REV] Reverted hack about attachments, that was not good. 

bzr revid: tde@openerp.com-20120907115422-zfynv8pdsxk5p3vg
This commit is contained in:
Thibault Delavallée 2012-09-07 13:54:22 +02:00
parent 07663470e5
commit 910bc5f00a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/mail/mail_message.py
View File

@ -306,12 +306,11 @@ class mail_message(osv.Model):
def unlink(self, cr, uid, ids, context=None):
# cascade-delete attachments that are directly attached to the message (should only happen
# for mail.messages that act as parent for a standalone mail.mail record). Also remove
# attachment with a void id, because this can happen with the composer.
# for mail.messages that act as parent for a standalone mail.mail record).
attachments_to_delete = []
for message in self.browse(cr, uid, ids, context=context):
for attach in message.attachment_ids:
if attach.res_model == self._name and (attach.res_id == message.id or attach.res_id == 0):
if attach.res_model == self._name and attach.res_id == message.id:
attachments_to_delete.append(attach.id)
if attachments_to_delete:
self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)