fix bug

1 files changed, 13 insertions, 10 deletions

diff --git a/fixco_custom/models/shipment_group.py b/fixco_custom/models/shipment_group.py
index 705c13e..019c995 100644
--- a/fixco_custom/models/shipment_group.py
+++ b/fixco_custom/models/shipment_group.py
@@ -194,12 +194,11 @@ class PickingLine(models.Model):
         for line in self:
             if line.scan_receipt:
                 duplicate_receipt = self.search([
-                    ('scan_receipt', '=', line.scan_receipt),
-                    ('id', '!=', line.id)
+                    ('scan_receipt', '=', line.scan_receipt)
                 ], limit=1)
-                if duplicate_receipt:
+                if len(duplicate_receipt) > 0:
                     line.scan_receipt = False
-                    raise UserError(f'Scan Receipt {line.scan_receipt} sudah digunakan di Shipment Group {duplicate_receipt.shipment_id.name}')
+                    raise UserError(f'Scan Receipt sudah digunakan di {duplicate_receipt.mapped("shipment_id").number} lain!')
 
                 picking = self.env['stock.picking'].search([
                     ('tracking_number', '=', line.scan_receipt)
@@ -207,15 +206,19 @@ class PickingLine(models.Model):
                 
                 if not picking:
                     line.scan_receipt = False
-                    raise UserError(f'Picking dengan Tracking Number {line.scan_receipt} tidak ditemukan')
+                    return {
+                        'warning': {
+                            'title': "Data Tidak Ditemukan",
+                            'message': "Tidak ditemukan Picking dengan Tracking Number tersebut!"
+                        }
+                    }
 
                 duplicate_picking = self.search([
-                    ('picking_id', '=', picking.id),
-                    ('id', '!=', line.id)
-                ], limit=1)
-                if duplicate_picking:
+                    ('picking_id', '=', picking.id)
+                ])
+                if len(duplicate_picking) > 0:
                     line.scan_receipt = False
-                    raise UserError(f'Picking dengan Tracking Number {line.scan_receipt} sudah digunakan di Shipment Group {duplicate_picking.shipment_id.name}')
+                    raise UserError(f'Picking ini sudah digunakan di {duplicate_picking.mapped("shipment_id").number} lain!')
 
                 line.picking_id = picking
                 line.carrier = picking.carrier