1 files changed, 16 insertions, 2 deletions
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index a4bc2309..90cd5fa2 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -647,7 +647,7 @@ class SaleOrder(models.Model):
 
     def _get_biteship_courier_codes(self):
         return [
-            'gojek','grab','deliveree','lalamove','jne','tiki','ninja','lion','rara','sicepat','jnt','pos','idexpress','rpx','wahana','jdl','pos','anteraja','sap','paxel','borzo'
+            'gojek','grab','deliveree','lalamove','jne','ninja','lion','rara','sicepat','jnt','pos','idexpress','rpx','wahana','jdl','anteraja','sap','paxel','borzo'
         ]
         
     @api.onchange('carrier_id')
@@ -2316,7 +2316,7 @@ class SaleOrder(models.Model):
         for order in self:
             for line in order.order_line:
                 search_product = self.env['sale.order.line'].search(
-                    [('product_id', '=', line.product_id.id), ('order_id', '=', order.id)])
+                    [('product_id', '=', line.product_id.id), ('order_id', '=', order.id), ('display_type', '=', False)])
                 if len(search_product) > 1:
                     raise UserError("Terdapat DUPLIKASI data pada Product {}".format(line.product_id.display_name))
 
@@ -2598,6 +2598,18 @@ class SaleOrder(models.Model):
         else:
             return False
 
+    def check_archived_product(self):
+        for order in self:
+            for line in order.order_line:
+                if line.product_id.active == False:
+                    raise UserError("Terdapat Product yang sudah di Archive pada Product: {}".format(line.product_id.display_name))
+
+    def check_archived_uom(self):
+        for order in self:
+            for line in order.order_line:
+                if line.product_uom.active == False:
+                    raise UserError("Terdapat UoM yang sudah di Archive pada UoM {} di Product {}".format(line.product_uom.name, line.product_id.display_name))
+
     def action_confirm(self):
         for order in self:
             order._validate_delivery_amt()
@@ -2614,6 +2626,8 @@ class SaleOrder(models.Model):
             order._validate_order()
             order._validate_npwp()
             order.order_line.validate_line()
+            order.check_archived_product()
+            order.check_archived_uom()
 
             main_parent = order.partner_id.get_main_parent()
             SYSTEM_UID = 25