[MERGE] lp:openobject-addons

bzr revid: jam@tinyerp.com-20120627042749-bcos0g5z9hy9gy7t

diff --cc addons/mail/mail_thread.py
index ce3b8ae,e0f2bfa..03b6b5a
--- 1/addons/mail/mail_thread.py
--- 2/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@@ -68,11 -68,15 +68,16 @@@ class mail_thread(osv.osv)
              res[id] = self.message_load_ids(cr, uid, [id], context=context)
          return res
  
+     def _search_message_ids(self, cr, uid, obj, name, args, context=None):
+         msg_obj = self.pool.get('mail.message')
+         msg_ids = msg_obj.search(cr, uid, ['&', ('res_id', 'in', args[0][2]), ('model', '=', self._name)], context=context)
+         return [('id', 'in', msg_ids)]
+ 
      # OpenChatter: message_ids is a dummy field that should not be used
      _columns = {
-         'message_ids': fields.function(_get_message_ids, method=True,
+         'message_ids': fields.function(_get_message_ids, method=True, fnct_search=_search_message_ids,
                          type='one2many', obj='mail.message', string='Temp messages', _fields_id = 'res_id'),
 +        'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
      }
  
      #------------------------------------------------------