Merge pull request #24 from rdeheele/7.0-change_fnct_search

[UPD] improve related_dispatch_ids fnct_search function
OCA · Oct 7, 2014 · f776cfc · f776cfc
2 parents 32b1949 + eeda4d1
commit f776cfc
Showing 1 changed file with 16 additions and 19 deletions.
diff --git a/picking_dispatch/picking_dispatch.py b/picking_dispatch/picking_dispatch.py
@@ -333,26 +333,23 @@ def _get_related_dispatch(self, cr, uid, ids, field_names, arg=None,
 
     def _search_dispatch_pickings(self, cr, uid, obj, name, args,
                                   context=None):
-        dispatch_ids = []
-        picking_ids = []
-        for arg in args:
-            if isinstance(arg, tuple):
-                dispatch_ids = arg[2]
-        if dispatch_ids:
+        if not len(args):
+            return []
+        picking_ids = set()
+        for field, symbol, value in args:
             move_obj = self.pool['stock.move']
             move_ids = move_obj.search(cr, uid,
-                                       [('dispatch_id', 'in', dispatch_ids)],
+                                       [('dispatch_id', symbol, value)],
                                        context=context)
             for move in move_obj.browse(cr, uid, move_ids, context=context):
-                if move.picking_id.id not in picking_ids:
-                    picking_ids.append(move.picking_id.id)
-        return [('id', 'in', picking_ids)]
+                picking_ids.add(move.picking_id.id)
+        return [('id', 'in', list(picking_ids))]
 
     _columns = {
         'related_dispatch_ids': fields.function(
-            _get_related_dispatch, method=True,
-            fnct_search=_search_dispatch_pickings, type='one2many',
-            relation='picking.dispatch', string='Related Dispatch Picking'),
+            _get_related_dispatch, fnct_search=_search_dispatch_pickings,
+            type='one2many', relation='picking.dispatch',
+            string='Related Dispatch Picking'),
     }
 
 
@@ -371,9 +368,9 @@ def _search_dispatch_pickings(self, cr, uid, obj, name, args,
 
     _columns = {
         'related_dispatch_ids': fields.function(
-            _get_related_dispatch, method=True,
-            fnct_search=_search_dispatch_pickings, type='one2many',
-            relation='picking.dispatch', string='Related Dispatch Picking'),
+            _get_related_dispatch, fnct_search=_search_dispatch_pickings,
+            type='one2many', relation='picking.dispatch',
+            string='Related Dispatch Picking'),
     }
 
 
@@ -392,9 +389,9 @@ def _search_dispatch_pickings(self, cr, uid, obj, name, args,
 
     _columns = {
         'related_dispatch_ids': fields.function(
-            _get_related_dispatch, method=True,
-            fnct_search=_search_dispatch_pickings, type='one2many',
-            relation='picking.dispatch', string='Related Dispatch Picking'),
+            _get_related_dispatch, fnct_search=_search_dispatch_pickings,
+            type='one2many', relation='picking.dispatch',
+            string='Related Dispatch Picking'),
     }