push

1 files changed, 3 insertions, 3 deletions

diff --git a/fixco_custom/models/stock_picking_shipment_group.py b/fixco_custom/models/stock_picking_shipment_group.py
index 1b1b1df..d317a99 100644
--- a/fixco_custom/models/stock_picking_shipment_group.py
+++ b/fixco_custom/models/stock_picking_shipment_group.py
@@ -16,11 +16,11 @@ class StockPickingShipmentGroup(models.TransientModel):
 
         pickings = self.env['stock.picking'].browse(picking_ids)
 
-        # Create the Shipment Group
         shipment_group = self.env['shipment.group'].create({})
 
         for picking in pickings:
-            # Link picking to shipment group
+            if picking.shipment_group_id:
+                continue
             picking.shipment_group_id = shipment_group.id
 
             for move in picking.move_ids_without_package:
@@ -29,9 +29,9 @@ class StockPickingShipmentGroup(models.TransientModel):
                     'product_id': move.product_id.id,
                     'carrier': picking.carrier,
                     'invoice_marketplace': picking.invoice_mp,
+                    'picking_id': picking.id,
                 })
 
-        # Return action to open the newly created shipment group
         return {
             'type': 'ir.actions.act_window',
             'res_model': 'shipment.group',