Merge lp:~serpent-consulting-services/openobject-addons/7.0-1171457-SerpentCS into lp:openobject-addons/7.0

[Serpent Consulting Services]

[Thibault Delavallée (OpenERP) (tde-openerp)]

Hello,

In mail_thread.message_post(), we want to attach manually added attachments (having mail.compose.message model) to the message's document (having in our case a False model). As we could have 'free' attachments in the 7.0 modeling of the communication, being able to write False as res_model is required.

The server fix has been merged into 7.0. This merge proposal is therefore not necessary anymore.

Best regards,

Unmerged revisions

9140. By Serpent Consulting Services on 2013-05-17

[FIX] mail : Unnecessary call to various server methods for an unsaved compose message

=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py	2013-05-08 10:23:04 +0000
+++ mail/mail_thread.py	2013-05-17 22:01:24 +0000
@@ -1048,7 +1048,7 @@
                 ('res_model', '=', 'mail.compose.message'),
                 ('create_uid', '=', uid),
                 ('id', 'in', attachment_ids)], context=context)
-            if filtered_attachment_ids:
+            if filtered_attachment_ids and model and thread_id:
                 ir_attachment.write(cr, SUPERUSER_ID, filtered_attachment_ids, {'res_model': model, 'res_id': thread_id}, context=context)
         attachment_ids = [(4, id) for id in attachment_ids]
         # Handle attachments parameter, that is a dictionary of attachments