diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index b5245e34dcd..275a0cd4e35 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -494,8 +494,9 @@ class Picking(models.Model):
         # TDE FIXME: what ?
         # As the on_change in one2many list is WIP, we will overwrite the locations on the stock moves here
         # As it is a create the format will be a list of (0, 0, dict)
-        if vals.get('move_lines') and vals.get('location_id') and vals.get('location_dest_id'):
-            for move in vals['move_lines']:
+        moves = vals.get('move_lines') or vals.get('move_ids_without_package')
+        if moves and vals.get('location_id') and vals.get('location_dest_id'):
+            for move in moves:
                 if len(move) == 3 and move[0] == 0:
                     move[2]['location_id'] = vals['location_id']
                     move[2]['location_dest_id'] = vals['location_dest_id']