Merge lp:~openerp-dev/openobject-addons/7.0-opw-600163-fka into lp:openobject-addons/7.0

[Foram Katharotiya (OpenERP)]

Hello,

I have fix the issue of advanced search on follower field in all module.It doesn't work properly with negative operator.
for ex:
create product1: set follower admin & demo
create product2: set follower demo
create product3: set follower admin

Now search product that doesn't contains demo
It display all products that are not contains demo but it display product1 & product3 instead of product3

Thanks,
FKA

Unmerged revisions

9604. By Foram Katharotiya (OpenERP) on 2013-11-22

[MERGE] with 7.0

9603. By Foram Katharotiya (OpenERP) on 2013-11-19

[IMP] improve code in def_search_followers()

=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py	2013-11-20 15:43:20 +0000
+++ mail/mail_thread.py	2013-11-22 09:30:30 +0000
@@ -199,9 +199,14 @@
     def _search_followers(self, cr, uid, obj, name, args, context):
         fol_obj = self.pool.get('mail.followers')
         res = []
+        negative_operator = {'not ilike':'ilike', '!=':'='}
         for field, operator, value in args:
             assert field == name
             fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('partner_id', operator, value)])
+            if operator in negative_operator.keys():
+                fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('partner_id', negative_operator[operator], value)])
+                res_id = [fol.res_id for fol in fol_obj.browse(cr, SUPERUSER_ID, fol_ids)]
+                fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_id', 'not in', res_id)])
             res_ids = [fol.res_id for fol in fol_obj.browse(cr, SUPERUSER_ID, fol_ids)]
             res.append(('id', 'in', res_ids))
         return res