(andri) resolved confict di SO view

1 files changed, 3 insertions, 6 deletions

diff --git a/indoteknik_custom/models/shipment_group.py b/indoteknik_custom/models/shipment_group.py
index b7d7ac12..48a3fa21 100644
--- a/indoteknik_custom/models/shipment_group.py
+++ b/indoteknik_custom/models/shipment_group.py
@@ -87,20 +87,17 @@ class ShipmentGroupLine(models.Model):
         if self.picking_id:
             picking = self.env['stock.picking'].browse(self.picking_id.id)
 
-            if self.shipment_id.partner_id and self.shipment_id.partner_id != picking.partner_id:
-                raise UserError('Partner must be same as shipment group')
-
             if self.shipment_id.carrier_id and self.shipment_id.carrier_id != picking.carrier_id:
                 raise UserError('carrier must be same as shipment group')
             
+            if picking.total_mapping_koli == 0:
+                raise UserError(f'Picking {picking.name} tidak memiliki mapping koli')
+            
             self.partner_id = picking.partner_id
             self.shipping_paid_by = picking.sale_id.shipping_paid_by
             self.carrier_id = picking.carrier_id.id
             self.total_colly = picking.total_mapping_koli
 
-            if not self.shipment_id.partner_id:
-                self.shipment_id.partner_id = picking.partner_id
-
             if not self.shipment_id.carrier_id:
                 self.shipment_id.carrier_id = picking.carrier_id