[MERGE] forward port branch 10.0 up to dc62cd8

2016-10-27 18:58:54 +02:00
parent ea479ce6f3 dc62cd8e00
commit b3e5d28e92
1 changed files with 1 additions and 4 deletions
@@ -627,11 +627,8 @@ class PosOrder(models.Model):
        StockProductionLot = self.env['stock.production.lot']
        PosPackOperationLot = self.env['pos.pack.operation.lot']

-        if not picking:
-            picking = order.picking_id
-
        for order in self:
-            for pack_operation in picking.pack_operation_ids:
+            for pack_operation in (picking or self.picking_id).pack_operation_ids:
                qty = 0
                qty_done = 0
                pack_lots = []