[MERGE] merged the branch of stw related to search on ir.attachment like domain=[('res_id', 'in', [3, 4, 5])]

bzr revid: qdp-launchpad@tinyerp.com-20110120115156-tnnetvmsy5jowycj
2011-01-20 12:51:56 +01:00
parent 24ac246c22 8d8cb5167c
commit c27736c6a5
1 changed files with 8 additions and 1 deletions
@@ -1766,7 +1766,14 @@ class ir_attachment(osv.osv):
        new_args = args
        for i, arg in enumerate(new_args):
            if arg[0] == 'res_id':
-                new_args[i] = (arg[0], arg[1], base_calendar_id2real_id(arg[2]))
+                ids = arg[2]
+                if arg[1].lower() in ('in', 'not in'):
+                    if not isinstance(ids, (tuple, list)):
+                        ids = [ids]
+
+                    ids = map(base_calendar_id2real_id, ids)
+
+                new_args[i] = (arg[0], arg[1], ids)
        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
                            limit=limit, order=order,
                            context=context, count=False)