Merge lp:~camptocamp/ocb-addons/7.0-send-message-slow-1311087 into lp:ocb-addons

[Guewen Baconnier @ Camptocamp]

Backport of: https://github.com/odoo/odoo/pull/461
Fixes lp:1311087

[Pedro Manuel Baeza (pedro.baeza)]

LGTM.

Regards.

review: Approve (code review)

[Laurent Mignon (Acsone) (lmi)]

LGTM.

Regards.

lmi

review: Approve (code review)

[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

10205. By Ravi Gohil (OpenERP) on 2014-06-11

[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)

10204. By Loïc Bellier - Numérigraphe on 2014-06-10

[IMP]: Due to huge memory usage on browse, slice move_ids to list of 10000 elements maximum on fill_inventory.

10203. By Launchpad Translations on behalf of openerp on 2014-06-08

Launchpad automatic translations update.

10202. By Stefan Rijnhart (Opener) on 2014-06-07

[FIX] project_timesheet: Prevent python term 'False' to show up in timesheet lines generated from task work

10201. By Launchpad Translations on behalf of openerp on 2014-05-29

Launchpad automatic translations update.

10200. By Launchpad Translations on behalf of openerp on 2014-05-28

Launchpad automatic translations update.

10199. By Launchpad Translations on behalf of openerp on 2014-05-27

Launchpad automatic translations update.

10198. By Launchpad Translations on behalf of openerp on 2014-05-26

Launchpad automatic translations update.

10197. By Launchpad Translations on behalf of openerp on 2014-05-23

Launchpad automatic translations update.

10196. By Launchpad Translations on behalf of openerp on 2014-05-22

Launchpad automatic translations update.

=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2014-03-10 08:54:20 +0000
+++ mail/mail_message.py	2014-06-11 09:26:30 +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])