Update purchase_order.py and sale_order.py

1 files changed, 4 insertions, 4 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 4ab8aa17..f1f281a8 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -76,15 +76,15 @@ class SaleOrder(models.Model):
                 raise UserError("Tax di Header harus diisi")
             approval1 = approval2 = 0
             for line in order.order_line:
+                if not line.product_id or line.product_id.type == 'service':
+                    continue
                 if line.product_id.id == 232383:
                     raise UserError(_('Tidak bisa Confirm menggunakan Produk Sementara'))
                 if not line.vendor_id or not line.purchase_price or not line.purchase_tax_id:
                     raise UserError(_('Isi Vendor, Harga Beli, dan Tax sebelum Request Approval'))
-                if not line.product_id or line.product_id.type == 'service':
-                    continue
-                if line.item_percent_margin <= 15 and not self.env.user.is_pimpinan:
+                if line.item_percent_margin <= 15 and not self.env.user.is_leader:
                     approval2 += 1
-                elif line.item_percent_margin <= 25 and not self.env.user.is_pimpinan and not self.env.user.is_sales_manager:
+                elif line.item_percent_margin <= 25 and not self.env.user.is_leader and not self.env.user.is_sales_manager:
                     approval1 += 1
             if approval2 > 0:
                 raise UserError("Harus diapprove oleh Pimpinan")