Merge lp:~unifield-team/unifield-addons/uf-715 into lp:unifield-addons

[jftempo]

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-11-21 13:19:03 +0000
+++ stock/stock.py	2011-12-14 13:15:31 +0000
@@ -1410,7 +1410,9 @@
         """
         if context is None:
             context = {}
-        if 'location_id' not in context:
+        # when the location_id = False results now in showing stock for all internal locations
+        # *previously*, was showing the location of no location (= 0.0 for all prodlot)
+        if 'location_id' not in context or not context['location_id']:
             locations = self.pool.get('stock.location').search(cr, uid, [('usage', '=', 'internal')], context=context)
         else:
             locations = context['location_id'] and [context['location_id']] or []
@@ -1435,21 +1437,27 @@
         """ Searches Ids of products
         @return: Ids of locations
         """
-        if context.get('location_id', False):
+        if context is None:
+            context = {}
+        # when the location_id = False results now in showing stock for all internal locations
+        # *previously*, was showing the location of no location (= 0.0 for all prodlot)
+        if 'location_id' not in context or not context['location_id']:
+            locations = self.pool.get('stock.location').search(cr, uid, [('usage', '=', 'internal')], context=context)
+        else:
             locations = context['location_id'] and [context['location_id']] or []
-        else:
-            locations = self.pool.get('stock.location').search(cr, uid, [('usage', '=', 'internal')])
 
-        cr.execute('''select
-                prodlot_id,
-                sum(qty)
-            from
-                stock_report_prodlots
-            where
-                location_id IN %s group by prodlot_id
-            having  sum(qty) '''+ str(args[0][1]) + str(args[0][2]),(tuple(locations),))
-        res = cr.fetchall()
-        ids = [('id', 'in', map(lambda x: x[0], res))]
+        ids = [('id', 'in', [])]
+        if locations:
+            cr.execute('''select
+                    prodlot_id,
+                    sum(qty)
+                from
+                    stock_report_prodlots
+                where
+                    location_id IN %s group by prodlot_id
+                having  sum(qty) '''+ str(args[0][1]) + str(args[0][2]),(tuple(locations),))
+            res = cr.fetchall()
+            ids = [('id', 'in', map(lambda x: x[0], res))]
         return ids
 
     _columns = {
@@ -2160,6 +2168,13 @@
                          'line_id': move_lines,
                          'ref': move.picking_id and move.picking_id.name})
 
+    def _hook_action_done_update_out_move_check(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        choose if the corresponding out stock move must be updated
+        '''
+        move = kwargs['move']
+        result = move.move_dest_id.id and (move.state != 'done')
+        return result
 
     def action_done(self, cr, uid, ids, context=None):
         """ Makes the move done and if all moves are done, it will finish the picking.
@@ -2193,7 +2208,7 @@
 
             if move.picking_id:
                 picking_ids.append(move.picking_id.id)
-            if move.move_dest_id.id and (move.state != 'done'):
+            if self._hook_action_done_update_out_move_check(cr, uid, ids, context=context, move=move,):
                 self.write(cr, uid, [move.id], {'move_history_ids': [(4, move.move_dest_id.id)]})
                 #cr.execute('insert into stock_move_history_ids (parent_id,child_id) values (%s,%s)', (move.id, move.move_dest_id.id))
                 if move.move_dest_id.state in ('waiting', 'confirmed'):