From 983fa2ec6b13f4005f4e27e7b7860503c4823f8e Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Wed, 4 Feb 2026 15:45:56 +0700
Subject: on confirm

---
 indoteknik_custom/models/purchase_order.py          | 14 +++++++-------
 indoteknik_custom/views/advance_payment_request.xml |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 6c3e4185..a066d90b 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1080,13 +1080,13 @@ class PurchaseOrder(models.Model):
                 ) % order.name)
                 
     def button_confirm(self):
-        # if self.env.user.id != 7 and not self.env.user.is_leader: # Pimpinan
-        #     if '/PJ/' in self.name:
-        #         price_change_detected = any(line.price_unit_before for line in self.order_line)
-        #         if price_change_detected:
-        #             if self.order_sales_match_line:
-        #                 if self.total_percent_margin <= 15.0:
-        #                     raise UserError("Approval Pimpinan diperlukan jika terdapat perubahan Unit Price pada PO Line dan Memiliki Margin <= 15%")
+        if self.env.user.id != 7 and not self.env.user.is_leader: # Pimpinan
+            if '/PJ/' in self.name:
+                price_change_detected = any(line.price_unit_before for line in self.order_line)
+                if price_change_detected:
+                    if self.order_sales_match_line:
+                        if self.total_percent_margin <= 25.0:
+                            raise UserError("Approval Pimpinan diperlukan jika terdapat perubahan Unit Price pada PO Line dan Memiliki Margin <= 15%")
 
         self._check_assets_note() 
         # self._check_payment_term() # check payment term 
diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 7f422aa9..340e0caf 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -236,6 +236,7 @@
                 <filter string="PUM" name="filter_pum" domain="[('type_request','=','pum')]"/>
                 <filter string="Reimburse" name="filter_reimburse" domain="[('type_request','=','reimburse')]"/>
                 <separator/>
+                <filter string="Cancelled" name="filter_cancelled" domain="[('status','=','cancel')]"/>
                 <filter string="Waiting for Approval" name="filter_waiting_approval" domain="[('status','in',['pengajuan1','pengajuan2','pengajuan3'])]"/>
                 <filter string="Approved" name="filter_approved" domain="[('status','=','approved')]"/>
                 <separator/>
-- 
cgit v1.2.3