<Miqdad> balikin sgr

1 files changed, 5 insertions, 14 deletions

diff --git a/fixco_custom/models/shipment_group.py b/fixco_custom/models/shipment_group.py
index 2663cd9..b4ed27b 100644
--- a/fixco_custom/models/shipment_group.py
+++ b/fixco_custom/models/shipment_group.py
@@ -215,22 +215,9 @@ class PickingLine(models.Model):
                 # ('id', '!=', line.id)
             ], limit=1)
 
-            dup2 = self.search([
-                ('scan_receipt', '=', line.invoice_marketplace),
-                # ('id', '!=', line.id)
-            ], limit=1)
-
-            if not (dup or dup2):
+            if not dup:
                 continue
 
-            if dup:
-                raise ValidationError(
-                "Receipt '%s' sudah digunakan di Shipment %s." %
-                (line.scan_receipt, dup.shipment_id.number or '-')
-                )
-            else:
-                raise UserError("Invoice Marketplace sudah digunakan")
-
             # 1. Dup di shipment yang sama (lagi create / edit)
             # if dup.shipment_id.id == line.shipment_id.id:
             #     raise ValidationError(
@@ -239,6 +226,10 @@ class PickingLine(models.Model):
             #     )
 
             # 2. Dup di shipment lain (data lama)
+            raise ValidationError(
+                "Receipt '%s' sudah digunakan di Shipment %s." %
+                (line.scan_receipt, dup.shipment_id.number or '-')
+            )
 
 
     @api.onchange('scan_receipt')