From 02673ab25169a1970f3c5dd28a41b73cb382e48e Mon Sep 17 00:00:00 2001 From: Sergi Almacellas Abellana Date: Thu, 15 May 2014 12:20:34 +0200 Subject: [PATCH] Fix bug on stock_lot patch --- issue10467.diff | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/issue10467.diff b/issue10467.diff index cc6da17..767b02f 100644 --- a/issue10467.diff +++ b/issue10467.diff @@ -3,7 +3,7 @@ Index: stock.py --- ./modules/stock_lot/stock.py +++ ./modules/stock_lot/stock.py -@@ -80,6 +80,18 @@ +@@ -80,6 +80,19 @@ for move in moves: move.check_lot() @@ -16,13 +16,14 @@ Index: stock.py + lot_moves.append(move) + else: + product_moves.append(move) -+ return (super(Move, cls).assign_try(product_moves, grouping=grouping) -+ and super(Move, cls).assign_try(lot_moves, grouping=('product', 'lot'))) ++ return (super(Move, cls).assign_try(lot_moves, ++ grouping=('product', 'lot')) and super(Move, cls).assign_try( ++ product_moves, grouping=grouping)) + class ShipmentIn: __name__ = 'stock.shipment.in' -@@ -121,6 +133,8 @@ +@@ -121,6 +134,8 @@ outgoing_moves = outgoing_by_product[move.product.id] while outgoing_moves and quantity > 0: out_move = outgoing_moves.pop() @@ -31,4 +32,3 @@ Index: stock.py out_quantity = Uom.compute_qty(out_move.uom, out_move.quantity, out_move.product.default_uom, round=False) -