Merge lp:~camptocamp/ocb-addons/7.0-fix-1311087-rgo into lp:ocb-addons

[Yannick Vaucher @ Camptocamp]

Fix delay issue when sending message.

This is the replication to ocb from official opw patch:

http://bazaar.launchpad.net/~openerp-dev/openobject-addons/7.0-opw-606994-rgo/revision/10065

This was also applied on master
https://github.com/odoo/odoo/blob/master/addons/mail/mail_message.py#L856-864

And also on 7.0
https://github.com/odoo/odoo/blob/7.0/addons/mail/mail_message.py#L881-888

[Leonardo Pistone (lepistone)]

Hi Yannick,

so this is already on the v7 on github. Now that OCB migration to github is in progress,
should we merge that in ocb on launchpad?

Other than that, I would approve the change.

Thanks!

review: Needs Information

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Replay isn't working yet and passing from lp to github will make us having to replay all the MP we did.

I think that while we don't have OCB fully working on github we can fill the gap by merging that kind of MP in OCB on launchpad.

[Stefan Rijnhart (Opener) (stefan-opener)]

Please merge here on LP for the coming days, not on GitHub. The OCB branches will be overwritten by the final migration.

[Leonardo Pistone (lepistone)]

Thanks a lot Stefan.

review: Approve

[Holger Brunn (Therp) (hbrunn)]

Development for 7.0 has moved to github on https://github.com/OCA/ocb - please move your merge proposal there if it is still valid.

(I close and reject this in order to have a cleaner overview for 6.1 MPs which indeed have to be done on launchpad)

review: Disapprove

Unmerged revisions

10218. By Ravi Gohil (OpenERP) on 2014-06-24

[FIX] mail: speed improvement in the process of sending an email through 'Send by email' option, fix backported from trunk rev: 9345(issue reproduced with client's db which has 6 million records for 'subtype_ids' o2m table). (Maintenance Case: 606994)

=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2014-03-10 08:54:20 +0000
+++ mail/mail_message.py	2014-06-24 08:43:01 +0000
@@ -881,9 +881,11 @@
             fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
                 ('res_model', '=', message.model),
                 ('res_id', '=', message.res_id),
-                ('subtype_ids', 'in', message.subtype_id.id)
                 ], context=context)
-            partners_to_notify |= set(fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context))
+            partners_to_notify |= set(
+                fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)
+                if message.subtype_id.id in [st.id for st in fo.subtype_ids]
+            )
         # remove me from notified partners, unless the message is written on my own wall
         if message.author_id and message.model == "res.partner" and message.res_id == message.author_id.id:
             partners_to_notify |= set([message.author_id])