From 9c663e33bebc09d65614c5158c98270e964c9a06 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 30 Oct 2025 11:15:47 +0700
Subject: fix bug

---
 indoteknik_custom/models/sale_order.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 494aeaa2..b8de1697 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2716,11 +2716,13 @@ class SaleOrder(models.Model):
         if user.is_leader or user.is_sales_manager:
             return True
 
-        if user.id in (3401, 20, 3988, 17340): # admin (fida, nabila, ninda)
+        if not self.env.context.get("ask_approval") and user.id in (3401, 20, 3988, 17340): # admin (fida, nabila, ninda)
             raise UserError("Yahaha gabisa confirm so, minta ke sales nya ajah")
-
+        
         if self.env.context.get("ask_approval") and user.id in (3401, 20, 3988):
             return True
+        
+
 
         salesperson_id = self.user_id.id
         approver_id = user.id
-- 
cgit v1.2.3


From 21738b9d99acac49a041ab0c2a7dd99c94e3ed12 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 30 Oct 2025 15:43:06 +0700
Subject: <Miqdad> fix gk bisa edit tanggal kirim sj

---
 indoteknik_custom/models/stock_move.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index 8f8ba66f..43c4676e 100644
--- a/indoteknik_custom/models/stock_move.py
+++ b/indoteknik_custom/models/stock_move.py
@@ -219,12 +219,14 @@ class StockMoveLine(models.Model):
             if done_qty == 0:
                 line.delivery_status = 'none'
             elif done_qty > 0:
-                has_other_out = self.env['stock.picking'].search_count([
-                    ('group_id', '=', picking.group_id.id),
-                    ('name', 'ilike', 'BU/OUT'),
-                    ('id', '!=', picking.id),
-                    ('state', '=', 'done'),
-                ])
+                has_other_out = 0
+                if picking.group_id and isinstance(picking.id, int):
+                    has_other_out = self.env['stock.picking'].search_count([
+                        ('group_id', '=', picking.group_id.id),
+                        ('name', 'ilike', 'BU/OUT'),
+                        ('id', '!=', picking.id),
+                        ('state', '=', 'done'),
+                    ])
                 if has_other_out and done_qty == total_qty:
                     line.delivery_status = 'partial_final'
                 elif not has_other_out and done_qty >= total_qty:
@@ -236,7 +238,6 @@ class StockMoveLine(models.Model):
                 else:
                     line.delivery_status = 'none'
 
-
     # Ambil uom dari stock move
     @api.model
     def create(self, vals):
-- 
cgit v1.2.3


From 2a5062c7e292086df579420545f79801b80967e2 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 30 Oct 2025 15:56:55 +0700
Subject: (andri) fix partner jurnal

---
 indoteknik_custom/models/advance_payment_request.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index 5a465ca4..66f0aac6 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -1194,7 +1194,8 @@ class AdvancePaymentSettlement(models.Model):
         if not self.pum_id or not self.pum_id.move_id:
             raise UserError("PUM terkait atau CAB belum tersedia.")
 
-        partner_id = self.pum_id.user_id.partner_id.id
+        # partner_id = self.pum_id.user_id.partner_id.id
+        partner_id = self.pum_id.applicant_name.partner_id.id
         cab_move = self.pum_id.move_id
 
         # Account Bank Intransit dari CAB: 
@@ -1424,7 +1425,8 @@ class AdvancePaymentCreateBill(models.TransientModel):
         #     raise UserError('Hanya AP yang dapat menggunakan ini.')
 
         apr = self.apr_id
-        partner_id = apr.user_id.partner_id.id
+        # partner_id = apr.user_id.partner_id.id
+        partner_id = apr.applicant_name.partner_id.id
 
         ref_label = f'{apr.number} - {apr.detail_note or "-"}'
 
@@ -1496,7 +1498,8 @@ class CreateReimburseCabWizard(models.TransientModel):
             raise UserError("Tidak ada rincian reimburse yang bisa dijurnalkan.")
 
         lines = []
-        partner_id = request.user_id.partner_id.id
+        # partner_id = request.user_id.partner_id.id
+        partner_id = request.applicant_name.partner_id.id
         
         # 1. Buat Jurnal DEBIT dari setiap baris reimburse
         for line in request.reimburse_line_ids:
-- 
cgit v1.2.3


From 255268563d2b739c5bf4a756614b280067d67050 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 30 Oct 2025 16:01:06 +0700
Subject: (andri) fix label journal

---
 indoteknik_custom/models/advance_payment_request.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index 66f0aac6..187db257 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -1500,7 +1500,7 @@ class CreateReimburseCabWizard(models.TransientModel):
         lines = []
         # partner_id = request.user_id.partner_id.id
         partner_id = request.applicant_name.partner_id.id
-        
+        ref_label = f'{request.number} - {request.detail_note or "-"}'
         # 1. Buat Jurnal DEBIT dari setiap baris reimburse
         for line in request.reimburse_line_ids:
             if not line.account_id:
@@ -1518,12 +1518,11 @@ class CreateReimburseCabWizard(models.TransientModel):
         lines.append((0, 0, {
             'account_id': self.account_id.id,
             'partner_id': partner_id,
-            'name': f'Reimburse {request.number}',
+            'name': ref_label,
             'debit': 0,
             'credit': request.grand_total_reimburse,
         }))
 
-        ref_label = f'{request.number} - {request.detail_note or "-"}'
 
         # 3. Buat Journal Entry
         move = self.env['account.move'].create({
-- 
cgit v1.2.3


From d5968a30eaf997b9eaa01f4630fda3f411eaa0b5 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 30 Oct 2025 16:51:21 +0700
Subject: (andri) add user AP

---
 .../models/advance_payment_request.py              | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index 187db257..a1e63403 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -159,7 +159,7 @@ class AdvancePaymentRequest(models.Model):
             self.nominal = self.grand_total_reimburse
 
     def _compute_is_current_user_ap(self):
-        ap_user_ids = [23, 9468]
+        ap_user_ids = [23, 9468, 16729]
         is_ap = self.env.user.id in ap_user_ids
         for line in self:
             line.is_current_user_ap = is_ap
@@ -372,7 +372,7 @@ class AdvancePaymentRequest(models.Model):
     def action_view_journal_uangmuka(self):
         self.ensure_one()
         
-        ap_user_ids = [23, 9468] 
+        ap_user_ids = [23, 9468, 16729] 
         if self.env.user.id not in ap_user_ids:
             raise UserError('Hanya User AP yang dapat menggunakan fitur ini.')
 
@@ -497,7 +497,7 @@ class AdvancePaymentRequest(models.Model):
         # jakarta_tz = pytz.timezone('Asia/Jakarta')
         # now = datetime.now(jakarta_tz).replace(tzinfo=None)
         
-        ap_user_ids = [23, 9468]
+        ap_user_ids = [23, 9468, 16729]
         if self.env.user.id not in ap_user_ids:
             raise UserError('Hanya User AP yang dapat menggunakan fitur ini.')
 
@@ -572,7 +572,7 @@ class AdvancePaymentRequest(models.Model):
                 )
 
             elif rec.status == 'pengajuan2':
-                ap_user_ids = [23, 9468]  # List user ID yang boleh approve sebagai Finance AP
+                ap_user_ids = [23, 9468, 16729]  # List user ID yang boleh approve sebagai Finance AP
                 if self.env.user.id not in ap_user_ids:
                     raise UserError("Hanya AP yang berhak menyetujui tahap ini.")
                 rec.name_approval_ap = self.env.user.name
@@ -614,7 +614,7 @@ class AdvancePaymentRequest(models.Model):
     def action_ap_only(self):
         self.ensure_one()
 
-        ap_user_ids = [23, 9468]  # Ganti sesuai kebutuhan
+        ap_user_ids = [23, 9468, 16729]  # Ganti sesuai kebutuhan
         if self.env.user.id not in ap_user_ids:
             raise UserError('Hanya User AP yang dapat menggunakan fitur ini.')
 
@@ -855,7 +855,7 @@ class AdvancePaymentUsageLine(models.Model):
     )
 
     def _compute_is_current_user_ap(self):
-        ap_user_ids = [23, 9468]
+        ap_user_ids = [23, 9468, 16729]
         is_ap = self.env.user.id in ap_user_ids
         for line in self:
             line.is_current_user_ap = is_ap
@@ -875,7 +875,7 @@ class AdvancePaymentUsageLine(models.Model):
 
     @api.onchange('done_attachment')
     def _onchange_done_attachment(self):
-        ap_user_ids = [23, 9468]  # List user ID yang boleh approve sebagai Finance AP
+        ap_user_ids = [23, 9468, 16729] # List user ID yang boleh approve sebagai Finance AP
         
         if self.done_attachment and self.env.user.id not in ap_user_ids:
             self.done_attachment = False
@@ -944,7 +944,7 @@ class ReimburseLine(models.Model):
     )
 
     def _compute_is_current_user_ap(self):
-        ap_user_ids = [23, 9468]
+        ap_user_ids = [23, 9468, 16729]
         is_ap = self.env.user.id in ap_user_ids
         for line in self:
             line.is_current_user_ap = is_ap
@@ -1081,13 +1081,13 @@ class AdvancePaymentSettlement(models.Model):
     )
 
     def _compute_is_current_user_ap(self):
-        ap_user_ids = [23, 9468]
+        ap_user_ids = [23, 9468, 16729]
         is_ap = self.env.user.id in ap_user_ids
         for line in self:
             line.is_current_user_ap = is_ap
 
     def action_toggle_check_attachment(self):
-        ap_user_ids = [23, 9468]
+        ap_user_ids = [23, 9468, 16729]
         if self.env.user.id not in ap_user_ids:
             raise UserError('Hanya User AP yang dapat menggunakan tombol ini.')
 
@@ -1121,7 +1121,7 @@ class AdvancePaymentSettlement(models.Model):
     def action_view_journal_uangmuka(self):
         self.ensure_one()
 
-        ap_user_ids = [23, 9468] 
+        ap_user_ids = [23, 9468, 16729]
         if self.env.user.id not in ap_user_ids:
             raise UserError('Hanya User AP yang dapat menggunakan fitur ini.')
         
@@ -1185,7 +1185,7 @@ class AdvancePaymentSettlement(models.Model):
     def action_cab(self):
         self.ensure_one()
 
-        ap_user_ids = [23, 9468]  # List user ID yang boleh approve sebagai Finance AP
+        ap_user_ids = [23, 9468, 16729] # List user ID yang boleh approve sebagai Finance AP
         if self.env.user.id not in ap_user_ids:
             raise UserError('Hanya User AP yang dapat menggunakan ini.')
         if self.move_id:
@@ -1311,7 +1311,7 @@ class AdvancePaymentSettlement(models.Model):
                 )
 
             elif rec.status == 'pengajuan2':
-                ap_user_ids = [23, 9468]  # List user ID yang boleh approve sebagai Finance AP
+                ap_user_ids = [23, 9468, 16729]  # List user ID yang boleh approve sebagai Finance AP
                 if self.env.user.id not in ap_user_ids:  
                     raise UserError("Hanya AP yang berhak menyetujui tahap ini.")
                 rec.name_approval_ap = self.env.user.name
-- 
cgit v1.2.3


From 88251508d31e0d110dd79ceafe430a0480a10c2b Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 30 Oct 2025 17:34:26 +0700
Subject: (andri) fix note

---
 indoteknik_custom/models/advance_payment_request.py    | 10 ++++++++--
 indoteknik_custom/views/advance_payment_settlement.xml |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index a1e63403..c82c09ff 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -989,7 +989,7 @@ class AdvancePaymentSettlement(models.Model):
     name = fields.Char(string='Nama', readonly=True, tracking=3)
     title = fields.Char(string='Judul', tracking=3)
     goals = fields.Text(string='Tujuan', tracking=3)
-    related = fields.Char(string='Terkait', tracking=3)
+    related = fields.Char(string='Dok. Terkait', tracking=3)
 
     # pemberian_line_ids = fields.One2many(
     #     'advance.payment.settlement.line', 'realization_id', string='Rincian Pemberian'
@@ -1008,7 +1008,13 @@ class AdvancePaymentSettlement(models.Model):
     # value_down_payment = fields.Float(string='PUM', tracking=3)
     remaining_value = fields.Float(string='Sisa Uang PUM', tracking=3, compute='_compute_remaining_value')
 
-    note_approval = fields.Text(string='Note Persetujuan', tracking=3)
+    def _get_default_note_approval(self):
+        template = (
+            "Demikian dokumen Realisasi Uang Muka ini saya buat, dengan ini saya meminta persetujuan dibawah atas hasil penggunaan uang muka yang saya gunakan untuk kebutuhan realisasi "
+        )
+        return template
+
+    note_approval = fields.Text(string='Note Persetujuan', tracking=3, default=_get_default_note_approval)
 
     name_approval_departement = fields.Char(string='Approval Departement')
     name_approval_ap = fields.Char(string='Approval AP')
diff --git a/indoteknik_custom/views/advance_payment_settlement.xml b/indoteknik_custom/views/advance_payment_settlement.xml
index 1a9d7908..188f09d0 100644
--- a/indoteknik_custom/views/advance_payment_settlement.xml
+++ b/indoteknik_custom/views/advance_payment_settlement.xml
@@ -47,7 +47,9 @@
                             <field name="title" required="1"/>
                             <field name="goals" required="1"/>
                             <field name="related" required="1"/>
-                            <field name="note_approval" required="1"/>
+                            <field name="note_approval"/>
+                            <p style="font-size: 11px; color: grey; font-style: italic">*Lengkapi keterangan berikut selaras dengan realisasi yang dilakukan (sesuai dengan format surat yang ada)</p>
+                            <br/><br/>
                             <field name="lot_of_attachment"/>
                             <field name="approved_by" readonly="1"/>
                             <field name="applicant_name" readonly="1"/>
-- 
cgit v1.2.3


From 2a57a75b636128cda3d1ee321a926643c461dacf Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 30 Oct 2025 17:51:10 +0700
Subject: (andri) fix

---
 indoteknik_custom/views/advance_payment_request.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 2a8e1318..f8217150 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -85,7 +85,7 @@
                     <group col="2">
                         <group string=" ">
                             <field name="type_request" attrs="{'readonly': [('status', '=', 'approved')]}"/>
-                            <field name="is_represented" attrs="{'readonly': [('status', '=', 'approved')], 'invisible': [('type_request', '=', 'reimburse')]}"/>
+                            <field name="is_represented" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="applicant_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="position_type" force_save="1" readonly="1"/>
                             <field name="nominal" colspan="2" attrs="{'readonly': ['|', ('status', '=', 'approved'), ('type_request', '=', 'reimburse')]}" force_save="1"/>
-- 
cgit v1.2.3


From 4bdebe2972657f95b4d40251121c08acef17ab8a Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 31 Oct 2025 10:13:52 +0700
Subject: big fux

---
 indoteknik_custom/models/sale_order.py    |   2 -
 indoteknik_custom/models/stock_move.py    | 117 ++++++++++++++++++++----------
 indoteknik_custom/models/stock_picking.py |  15 ++--
 indoteknik_custom/views/stock_picking.xml |   6 +-
 4 files changed, 93 insertions(+), 47 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index b8de1697..1eba2808 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2722,8 +2722,6 @@ class SaleOrder(models.Model):
         if self.env.context.get("ask_approval") and user.id in (3401, 20, 3988):
             return True
         
-
-
         salesperson_id = self.user_id.id
         approver_id = user.id
         team_leader_id = self.team_id.user_id.id
diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index 43c4676e..cac88287 100644
--- a/indoteknik_custom/models/stock_move.py
+++ b/indoteknik_custom/models/stock_move.py
@@ -186,9 +186,19 @@ class StockMoveLine(models.Model):
     line_no = fields.Integer('No', default=0)
     note = fields.Char('Note')
     manufacture = fields.Many2one('x_manufactures', string="Brands", related="product_id.x_manufacture", store=True)
-    outstanding_qty = fields.Float(
-        string='Outstanding Qty',
-        compute='_compute_delivery_line_status',
+    qty_yang_mau_dikirim = fields.Float(
+        string='Qty yang Mau Dikirim',
+        compute='_compute_delivery_status_detail',
+        store=False
+    )
+    qty_terkirim = fields.Float(
+        string='Qty Terkirim',
+        compute='_compute_delivery_status_detail',
+        store=False
+    )
+    qty_gantung = fields.Float(
+        string='Qty Gantung',
+        compute='_compute_delivery_status_detail',
         store=False
     )
     delivery_status = fields.Selection([
@@ -196,47 +206,80 @@ class StockMoveLine(models.Model):
         ('partial', 'Partial'),
         ('partial_final', 'Partial Final'),
         ('full', 'Full'),
-    ], string='Delivery Status', compute='_compute_delivery_line_status', store=False)
+    ], string='Delivery Status', compute='_compute_delivery_status_detail', store=False)
 
     @api.depends('qty_done', 'product_uom_qty', 'picking_id.state')
-    def _compute_delivery_line_status(self):
-        for line in self:
-            line.outstanding_qty = 0.0
-            line.delivery_status = 'none'
-
-            picking = line.picking_id
-            if not picking or picking.picking_type_id.code != 'outgoing':
+    def _compute_delivery_status_detail(self):
+        for picking in self:
+            # Default values
+            picking.qty_yang_mau_dikirim = 0.0
+            picking.qty_terkirim = 0.0
+            picking.qty_gantung = 0.0
+            picking.delivery_status = 'none'
+
+            # Hanya berlaku untuk pengiriman (BU/OUT)
+            if picking.picking_id.picking_type_id.code != 'outgoing':
                 continue
 
-            total_qty = line.move_id.product_uom_qty or 0
-            done_qty = line.qty_done or 0
-
-            line.outstanding_qty = max(total_qty - done_qty, 0)
+            if picking.picking_id.name not in ['BU/OUT']:
+                continue
 
-            if total_qty == 0:
+            move_lines = picking
+            if not move_lines:
                 continue
 
-            if done_qty == 0:
-                line.delivery_status = 'none'
-            elif done_qty > 0:
-                has_other_out = 0
-                if picking.group_id and isinstance(picking.id, int):
-                    has_other_out = self.env['stock.picking'].search_count([
-                        ('group_id', '=', picking.group_id.id),
-                        ('name', 'ilike', 'BU/OUT'),
-                        ('id', '!=', picking.id),
-                        ('state', '=', 'done'),
-                    ])
-                if has_other_out and done_qty == total_qty:
-                    line.delivery_status = 'partial_final'
-                elif not has_other_out and done_qty >= total_qty:
-                    line.delivery_status = 'full'
-                elif has_other_out and done_qty < total_qty:
-                    line.delivery_status = 'partial'
-                elif done_qty < total_qty:
-                    line.delivery_status = 'partial'
-                else:
-                    line.delivery_status = 'none'
+            # ======================
+            # HITUNG QTY
+            # ======================
+            total_qty = move_lines.product_uom_qty
+
+            done_qty_total = move_lines.move_id.sale_line_id.qty_delivered 
+            order_qty_total = move_lines.move_id.sale_line_id.product_uom_qty 
+            gantung_qty_total = order_qty_total - done_qty_total - total_qty
+
+            picking.qty_yang_mau_dikirim = total_qty
+            picking.qty_terkirim = done_qty_total
+            picking.qty_gantung = gantung_qty_total
+
+            # if total_qty == 0:
+            #     picking.delivery_status = 'none'
+            #     continue
+
+            # if done_qty_total == 0:
+            #     picking.delivery_status = 'none'
+            #     continue
+
+            # ======================
+            # CEK BU/OUT LAIN (BACKORDER)
+            # ======================
+            # has_other_out = self.env['stock.picking'].search_count([
+            #     ('group_id', '=', picking.group_id.id),
+            #     ('name', 'ilike', 'BU/OUT'),
+            #     ('id', '!=', picking.id),
+            #     ('state', 'in', ['assigned', 'waiting', 'confirmed', 'done']),
+            # ])
+
+            # ======================
+            # LOGIKA STATUS
+            # ======================
+            if gantung_qty_total == 0 and done_qty_total == 0:
+                # Semua barang udah terkirim, ga ada picking lain
+                picking.delivery_status = 'full'
+
+            elif gantung_qty_total > 0 and total_qty > 0 and done_qty_total == 0:
+                # Masih ada picking lain dan sisa gantung → proses masih jalan
+                picking.delivery_status = 'partial'
+
+            # elif gantung_qty_total > 0:
+            #     # Ini picking terakhir, tapi qty belum full
+            #     picking.delivery_status = 'partial_final'
+
+            elif gantung_qty_total == 0 and done_qty_total > 0 and total_qty > 0:
+                # Udah kirim semua tapi masih ada picking lain (rare case)
+                picking.delivery_status = 'partial_final'
+
+            else:
+                picking.delivery_status = 'none'
 
     # Ambil uom dari stock move
     @api.model
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 7f8523a3..273fda82 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -212,6 +212,9 @@ class StockPicking(models.Model):
             if picking.picking_type_id.code != 'outgoing':
                 continue
 
+            if picking.name not in ['BU/OUT']:
+                continue
+
             move_lines = picking.move_line_ids_without_package
             if not move_lines:
                 continue
@@ -240,12 +243,12 @@ class StockPicking(models.Model):
             # ======================
             # CEK BU/OUT LAIN (BACKORDER)
             # ======================
-            has_other_out = self.env['stock.picking'].search_count([
-                ('group_id', '=', picking.group_id.id),
-                ('name', 'ilike', 'BU/OUT'),
-                ('id', '!=', picking.id),
-                ('state', 'in', ['assigned', 'waiting', 'confirmed', 'done']),
-            ])
+            # has_other_out = self.env['stock.picking'].search_count([
+            #     ('group_id', '=', picking.group_id.id),
+            #     ('name', 'ilike', 'BU/OUT'),
+            #     ('id', '!=', picking.id),
+            #     ('state', 'in', ['assigned', 'waiting', 'confirmed', 'done']),
+            # ])
 
             # ======================
             # LOGIKA STATUS
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 050fc819..288a91c9 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -398,8 +398,10 @@
                       decoration-danger="qty_done&gt;product_uom_qty and state!='done' and parent.picking_type_code != 'incoming'"
                       decoration-success="qty_done==product_uom_qty and state!='done' and not result_package_id">
                     <field name="note" placeholder="Add a note here"/>
-                    <field name="outstanding_qty"/>
-                    <field name="delivery_status" widget="badge" options="{'colors': {'full': 'success', 'partial': 'warning', 'partial_final': 'danger'}}"/>
+                    <field name="qty_yang_mau_dikirim" attrs="{'invisible': ['|', ('parent.name', '=', False), ('parent.name', 'not', ['BU/OUT/'])]}"/>
+                    <field name="qty_terkirim" attrs="{'invisible': ['|', ('parent.name', '=', False), ('parent.name', 'not', ['BU/OUT/'])]}"/>
+                    <field name="qty_gantung" attrs="{'invisible': ['|', ('parent.name', '=', False), ('parent.name', 'not', ['BU/OUT/'])]}"/>
+                    <field name="delivery_status" attrs="{'invisible': ['|', ('parent.name', '=', False), ('parent.name', 'not', ['BU/OUT/'])]}" widget="badge" options="{'colors': {'full': 'success', 'partial': 'warning', 'partial_final': 'danger'}}"/>
                 </tree>
             </field>
         </record>
-- 
cgit v1.2.3


From c1640e45c37e6ab67cd90e2dbc415989a8a4ad45 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 31 Oct 2025 10:17:45 +0700
Subject: push

---
 indoteknik_custom/models/stock_move.py    | 117 ++++++++++--------------------
 indoteknik_custom/views/stock_picking.xml |   8 +-
 2 files changed, 41 insertions(+), 84 deletions(-)

diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index cac88287..43c4676e 100644
--- a/indoteknik_custom/models/stock_move.py
+++ b/indoteknik_custom/models/stock_move.py
@@ -186,19 +186,9 @@ class StockMoveLine(models.Model):
     line_no = fields.Integer('No', default=0)
     note = fields.Char('Note')
     manufacture = fields.Many2one('x_manufactures', string="Brands", related="product_id.x_manufacture", store=True)
-    qty_yang_mau_dikirim = fields.Float(
-        string='Qty yang Mau Dikirim',
-        compute='_compute_delivery_status_detail',
-        store=False
-    )
-    qty_terkirim = fields.Float(
-        string='Qty Terkirim',
-        compute='_compute_delivery_status_detail',
-        store=False
-    )
-    qty_gantung = fields.Float(
-        string='Qty Gantung',
-        compute='_compute_delivery_status_detail',
+    outstanding_qty = fields.Float(
+        string='Outstanding Qty',
+        compute='_compute_delivery_line_status',
         store=False
     )
     delivery_status = fields.Selection([
@@ -206,80 +196,47 @@ class StockMoveLine(models.Model):
         ('partial', 'Partial'),
         ('partial_final', 'Partial Final'),
         ('full', 'Full'),
-    ], string='Delivery Status', compute='_compute_delivery_status_detail', store=False)
+    ], string='Delivery Status', compute='_compute_delivery_line_status', store=False)
 
     @api.depends('qty_done', 'product_uom_qty', 'picking_id.state')
-    def _compute_delivery_status_detail(self):
-        for picking in self:
-            # Default values
-            picking.qty_yang_mau_dikirim = 0.0
-            picking.qty_terkirim = 0.0
-            picking.qty_gantung = 0.0
-            picking.delivery_status = 'none'
-
-            # Hanya berlaku untuk pengiriman (BU/OUT)
-            if picking.picking_id.picking_type_id.code != 'outgoing':
-                continue
+    def _compute_delivery_line_status(self):
+        for line in self:
+            line.outstanding_qty = 0.0
+            line.delivery_status = 'none'
 
-            if picking.picking_id.name not in ['BU/OUT']:
+            picking = line.picking_id
+            if not picking or picking.picking_type_id.code != 'outgoing':
                 continue
 
-            move_lines = picking
-            if not move_lines:
-                continue
+            total_qty = line.move_id.product_uom_qty or 0
+            done_qty = line.qty_done or 0
 
-            # ======================
-            # HITUNG QTY
-            # ======================
-            total_qty = move_lines.product_uom_qty
-
-            done_qty_total = move_lines.move_id.sale_line_id.qty_delivered 
-            order_qty_total = move_lines.move_id.sale_line_id.product_uom_qty 
-            gantung_qty_total = order_qty_total - done_qty_total - total_qty
-
-            picking.qty_yang_mau_dikirim = total_qty
-            picking.qty_terkirim = done_qty_total
-            picking.qty_gantung = gantung_qty_total
-
-            # if total_qty == 0:
-            #     picking.delivery_status = 'none'
-            #     continue
-
-            # if done_qty_total == 0:
-            #     picking.delivery_status = 'none'
-            #     continue
-
-            # ======================
-            # CEK BU/OUT LAIN (BACKORDER)
-            # ======================
-            # has_other_out = self.env['stock.picking'].search_count([
-            #     ('group_id', '=', picking.group_id.id),
-            #     ('name', 'ilike', 'BU/OUT'),
-            #     ('id', '!=', picking.id),
-            #     ('state', 'in', ['assigned', 'waiting', 'confirmed', 'done']),
-            # ])
-
-            # ======================
-            # LOGIKA STATUS
-            # ======================
-            if gantung_qty_total == 0 and done_qty_total == 0:
-                # Semua barang udah terkirim, ga ada picking lain
-                picking.delivery_status = 'full'
-
-            elif gantung_qty_total > 0 and total_qty > 0 and done_qty_total == 0:
-                # Masih ada picking lain dan sisa gantung → proses masih jalan
-                picking.delivery_status = 'partial'
-
-            # elif gantung_qty_total > 0:
-            #     # Ini picking terakhir, tapi qty belum full
-            #     picking.delivery_status = 'partial_final'
-
-            elif gantung_qty_total == 0 and done_qty_total > 0 and total_qty > 0:
-                # Udah kirim semua tapi masih ada picking lain (rare case)
-                picking.delivery_status = 'partial_final'
+            line.outstanding_qty = max(total_qty - done_qty, 0)
 
-            else:
-                picking.delivery_status = 'none'
+            if total_qty == 0:
+                continue
+
+            if done_qty == 0:
+                line.delivery_status = 'none'
+            elif done_qty > 0:
+                has_other_out = 0
+                if picking.group_id and isinstance(picking.id, int):
+                    has_other_out = self.env['stock.picking'].search_count([
+                        ('group_id', '=', picking.group_id.id),
+                        ('name', 'ilike', 'BU/OUT'),
+                        ('id', '!=', picking.id),
+                        ('state', '=', 'done'),
+                    ])
+                if has_other_out and done_qty == total_qty:
+                    line.delivery_status = 'partial_final'
+                elif not has_other_out and done_qty >= total_qty:
+                    line.delivery_status = 'full'
+                elif has_other_out and done_qty < total_qty:
+                    line.delivery_status = 'partial'
+                elif done_qty < total_qty:
+                    line.delivery_status = 'partial'
+                else:
+                    line.delivery_status = 'none'
 
     # Ambil uom dari stock move
     @api.model
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 288a91c9..78594375 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -398,10 +398,10 @@
                       decoration-danger="qty_done&gt;product_uom_qty and state!='done' and parent.picking_type_code != 'incoming'"
                       decoration-success="qty_done==product_uom_qty and state!='done' and not result_package_id">
                     <field name="note" placeholder="Add a note here"/>
-                    <field name="qty_yang_mau_dikirim" attrs="{'invisible': ['|', ('parent.name', '=', False), ('parent.name', 'not', ['BU/OUT/'])]}"/>
-                    <field name="qty_terkirim" attrs="{'invisible': ['|', ('parent.name', '=', False), ('parent.name', 'not', ['BU/OUT/'])]}"/>
-                    <field name="qty_gantung" attrs="{'invisible': ['|', ('parent.name', '=', False), ('parent.name', 'not', ['BU/OUT/'])]}"/>
-                    <field name="delivery_status" attrs="{'invisible': ['|', ('parent.name', '=', False), ('parent.name', 'not', ['BU/OUT/'])]}" widget="badge" options="{'colors': {'full': 'success', 'partial': 'warning', 'partial_final': 'danger'}}"/>
+                    <field name="qty_yang_mau_dikirim"/>
+                    <field name="qty_terkirim"/>
+                    <field name="qty_gantung"/>
+                    <field name="delivery_status" widget="badge" options="{'colors': {'full': 'success', 'partial': 'warning', 'partial_final': 'danger'}}"/>
                 </tree>
             </field>
         </record>
-- 
cgit v1.2.3


From 47b3591071225983cfec5d76497efe5cceae0af6 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 31 Oct 2025 10:19:09 +0700
Subject: push

---
 indoteknik_custom/models/stock_move.py | 117 ++++++++++++++++++++++-----------
 1 file changed, 80 insertions(+), 37 deletions(-)

diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index 43c4676e..cac88287 100644
--- a/indoteknik_custom/models/stock_move.py
+++ b/indoteknik_custom/models/stock_move.py
@@ -186,9 +186,19 @@ class StockMoveLine(models.Model):
     line_no = fields.Integer('No', default=0)
     note = fields.Char('Note')
     manufacture = fields.Many2one('x_manufactures', string="Brands", related="product_id.x_manufacture", store=True)
-    outstanding_qty = fields.Float(
-        string='Outstanding Qty',
-        compute='_compute_delivery_line_status',
+    qty_yang_mau_dikirim = fields.Float(
+        string='Qty yang Mau Dikirim',
+        compute='_compute_delivery_status_detail',
+        store=False
+    )
+    qty_terkirim = fields.Float(
+        string='Qty Terkirim',
+        compute='_compute_delivery_status_detail',
+        store=False
+    )
+    qty_gantung = fields.Float(
+        string='Qty Gantung',
+        compute='_compute_delivery_status_detail',
         store=False
     )
     delivery_status = fields.Selection([
@@ -196,47 +206,80 @@ class StockMoveLine(models.Model):
         ('partial', 'Partial'),
         ('partial_final', 'Partial Final'),
         ('full', 'Full'),
-    ], string='Delivery Status', compute='_compute_delivery_line_status', store=False)
+    ], string='Delivery Status', compute='_compute_delivery_status_detail', store=False)
 
     @api.depends('qty_done', 'product_uom_qty', 'picking_id.state')
-    def _compute_delivery_line_status(self):
-        for line in self:
-            line.outstanding_qty = 0.0
-            line.delivery_status = 'none'
-
-            picking = line.picking_id
-            if not picking or picking.picking_type_id.code != 'outgoing':
+    def _compute_delivery_status_detail(self):
+        for picking in self:
+            # Default values
+            picking.qty_yang_mau_dikirim = 0.0
+            picking.qty_terkirim = 0.0
+            picking.qty_gantung = 0.0
+            picking.delivery_status = 'none'
+
+            # Hanya berlaku untuk pengiriman (BU/OUT)
+            if picking.picking_id.picking_type_id.code != 'outgoing':
                 continue
 
-            total_qty = line.move_id.product_uom_qty or 0
-            done_qty = line.qty_done or 0
-
-            line.outstanding_qty = max(total_qty - done_qty, 0)
+            if picking.picking_id.name not in ['BU/OUT']:
+                continue
 
-            if total_qty == 0:
+            move_lines = picking
+            if not move_lines:
                 continue
 
-            if done_qty == 0:
-                line.delivery_status = 'none'
-            elif done_qty > 0:
-                has_other_out = 0
-                if picking.group_id and isinstance(picking.id, int):
-                    has_other_out = self.env['stock.picking'].search_count([
-                        ('group_id', '=', picking.group_id.id),
-                        ('name', 'ilike', 'BU/OUT'),
-                        ('id', '!=', picking.id),
-                        ('state', '=', 'done'),
-                    ])
-                if has_other_out and done_qty == total_qty:
-                    line.delivery_status = 'partial_final'
-                elif not has_other_out and done_qty >= total_qty:
-                    line.delivery_status = 'full'
-                elif has_other_out and done_qty < total_qty:
-                    line.delivery_status = 'partial'
-                elif done_qty < total_qty:
-                    line.delivery_status = 'partial'
-                else:
-                    line.delivery_status = 'none'
+            # ======================
+            # HITUNG QTY
+            # ======================
+            total_qty = move_lines.product_uom_qty
+
+            done_qty_total = move_lines.move_id.sale_line_id.qty_delivered 
+            order_qty_total = move_lines.move_id.sale_line_id.product_uom_qty 
+            gantung_qty_total = order_qty_total - done_qty_total - total_qty
+
+            picking.qty_yang_mau_dikirim = total_qty
+            picking.qty_terkirim = done_qty_total
+            picking.qty_gantung = gantung_qty_total
+
+            # if total_qty == 0:
+            #     picking.delivery_status = 'none'
+            #     continue
+
+            # if done_qty_total == 0:
+            #     picking.delivery_status = 'none'
+            #     continue
+
+            # ======================
+            # CEK BU/OUT LAIN (BACKORDER)
+            # ======================
+            # has_other_out = self.env['stock.picking'].search_count([
+            #     ('group_id', '=', picking.group_id.id),
+            #     ('name', 'ilike', 'BU/OUT'),
+            #     ('id', '!=', picking.id),
+            #     ('state', 'in', ['assigned', 'waiting', 'confirmed', 'done']),
+            # ])
+
+            # ======================
+            # LOGIKA STATUS
+            # ======================
+            if gantung_qty_total == 0 and done_qty_total == 0:
+                # Semua barang udah terkirim, ga ada picking lain
+                picking.delivery_status = 'full'
+
+            elif gantung_qty_total > 0 and total_qty > 0 and done_qty_total == 0:
+                # Masih ada picking lain dan sisa gantung → proses masih jalan
+                picking.delivery_status = 'partial'
+
+            # elif gantung_qty_total > 0:
+            #     # Ini picking terakhir, tapi qty belum full
+            #     picking.delivery_status = 'partial_final'
+
+            elif gantung_qty_total == 0 and done_qty_total > 0 and total_qty > 0:
+                # Udah kirim semua tapi masih ada picking lain (rare case)
+                picking.delivery_status = 'partial_final'
+
+            else:
+                picking.delivery_status = 'none'
 
     # Ambil uom dari stock move
     @api.model
-- 
cgit v1.2.3


From d50ce5c3553b97971debedcbb6fe896d99d92081 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 31 Oct 2025 15:45:13 +0700
Subject: <Miqdad> balikin

---
 indoteknik_custom/models/stock_move.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index cac88287..38cf0199 100644
--- a/indoteknik_custom/models/stock_move.py
+++ b/indoteknik_custom/models/stock_move.py
@@ -22,12 +22,12 @@ class StockMove(models.Model):
     partial = fields.Boolean('Partial?', default=False)
 
     # Ambil product uom dari SO line
-    @api.model
-    def create(self, vals):
-        if vals.get('sale_line_id'):
-            sale_line = self.env['sale.order.line'].browse(vals['sale_line_id'])
-            vals['product_uom'] = sale_line.product_uom.id
-        return super().create(vals)
+    # @api.model
+    # def create(self, vals):
+    #     if vals.get('sale_line_id'):
+    #         sale_line = self.env['sale.order.line'].browse(vals['sale_line_id'])
+    #         vals['product_uom'] = sale_line.product_uom.id
+    #     return super().create(vals)
 
     # @api.model_create_multi
     # def create(self, vals_list):
@@ -282,10 +282,10 @@ class StockMoveLine(models.Model):
                 picking.delivery_status = 'none'
 
     # Ambil uom dari stock move
-    @api.model
-    def create(self, vals):
-        if 'move_id' in vals and 'product_uom_id' not in vals:
-            move = self.env['stock.move'].browse(vals['move_id'])
-            if move.product_uom:
-                vals['product_uom_id'] = move.product_uom.id
-        return super().create(vals)
\ No newline at end of file
+    # @api.model
+    # def create(self, vals):
+    #     if 'move_id' in vals and 'product_uom_id' not in vals:
+    #         move = self.env['stock.move'].browse(vals['move_id'])
+    #         if move.product_uom:
+    #             vals['product_uom_id'] = move.product_uom.id
+    #     return super().create(vals)
\ No newline at end of file
-- 
cgit v1.2.3


From 58fdd12bb5ea91cbe65f23472879dd690d5efbbf Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Fri, 31 Oct 2025 15:52:49 +0700
Subject: push

---
 indoteknik_custom/views/refund_sale_order.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
index afa7c1cb..fbe17093 100644
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -57,7 +57,7 @@
                     <button name="action_trigger_cancel"
                             type="object"
                             string="Cancel"
-                            attrs="{'invisible': ['|', ('status_payment', '!=', 'pending'), ('status', 'in', ['reject', 'refund'])]}" />
+                            attrs="{'invisible': ['|', ('status_payment', '!=', 'pending'), ('status', '=', 'reject')]}" />
                     <button name="action_confirm_refund"
                             type="object"
                             string="Confirm Payment"
@@ -257,7 +257,7 @@
                             </group>
                         </page>
 
-                        <page string="Cancel Reason" attrs="{'invisible': [('status', '=', 'refund')]}">
+                        <page string="Cancel Reason" attrs="{'invisible': [('status_payment', '=', 'done')]}">
                             <group>
                                 <field name="reason_reject"/>
                             </group>
-- 
cgit v1.2.3


From c933cb57a0dbea8ba062a251f28f0a72eb4bb080 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Sat, 1 Nov 2025 07:46:02 +0700
Subject: (andri) it

---
 indoteknik_custom/models/advance_payment_request.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index c82c09ff..a3a3d20a 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -373,7 +373,8 @@ class AdvancePaymentRequest(models.Model):
         self.ensure_one()
         
         ap_user_ids = [23, 9468, 16729] 
-        if self.env.user.id not in ap_user_ids:
+        is_it = self.env.user.has_group('indoteknik_custom.group_role_it')
+        if self.env.user.id not in ap_user_ids and not is_it:
             raise UserError('Hanya User AP yang dapat menggunakan fitur ini.')
 
         if not self.move_id:
@@ -1127,8 +1128,9 @@ class AdvancePaymentSettlement(models.Model):
     def action_view_journal_uangmuka(self):
         self.ensure_one()
 
-        ap_user_ids = [23, 9468, 16729]
-        if self.env.user.id not in ap_user_ids:
+        ap_user_ids = [23, 9468, 16729] 
+        is_it = self.env.user.has_group('indoteknik_custom.group_role_it')
+        if self.env.user.id not in ap_user_ids and not is_it:
             raise UserError('Hanya User AP yang dapat menggunakan fitur ini.')
         
         if not self.move_id:
-- 
cgit v1.2.3


From c0380dd9b5ab6bf6a9538b9fa0c08082095c95fc Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Sat, 1 Nov 2025 09:17:32 +0700
Subject: refudn cancel walaupun udh approved

---
 indoteknik_custom/models/refund_sale_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index e6547a88..9eae5b32 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -989,7 +989,7 @@ class RefundSaleOrder(models.Model):
         for rec in self:
             if self.env.uid not in allowed_user_ids and not is_fat:
                 raise UserError("❌ Hanya user yang bersangkutan atau Finance (FAT) yang bisa melakukan penolakan.")
-            if rec.status not in ['refund', 'reject']:
+            if rec.status != 'reject':
                 rec.status = 'reject'
                 rec.status_payment = 'reject'
 
-- 
cgit v1.2.3


From 3c552beb2a8bbe51fecff96d3221a4ee1dedbe8f Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Sat, 1 Nov 2025 13:16:19 +0700
Subject: <Miqdad> remove write validation

---
 indoteknik_custom/models/tukar_guling_po.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/tukar_guling_po.py b/indoteknik_custom/models/tukar_guling_po.py
index 2a5ca3dd..739898a1 100644
--- a/indoteknik_custom/models/tukar_guling_po.py
+++ b/indoteknik_custom/models/tukar_guling_po.py
@@ -366,8 +366,8 @@ class TukarGulingPO(models.Model):
         #         if bu_put:
         #             raise UserError("❌ Tidak bisa retur BU/INPUT karena BU/PUT sudah Done!")
 
-        if self.operations.picking_type_id.id == 28 and tipe == 'tukar_guling':
-            raise UserError("❌ BU/INPUT tidak boleh di retur tukar guling")
+        # if self.operations.picking_type_id.id == 28 and tipe == 'tukar_guling':
+        #     raise UserError("❌ BU/INPUT tidak boleh di retur tukar guling")
 
         # if self.operations.picking_type_id.id != 28:
         #     if self._is_already_returned(self.operations):
-- 
cgit v1.2.3


From d636c09592c484fddd436e6881c5052fd06c028a Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 3 Nov 2025 09:00:23 +0700
Subject: <Miqdad> add so num in transfer

---
 indoteknik_custom/models/stock_picking.py | 8 ++++++++
 indoteknik_custom/views/stock_picking.xml | 1 +
 2 files changed, 9 insertions(+)

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 273fda82..c17fdbd5 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -198,6 +198,14 @@ class StockPicking(models.Model):
         ('partial_final', 'Partial Final'),
         ('full', 'Full'),
     ], string='Delivery Status', compute='_compute_delivery_status_detail', store=False)
+    so_num = fields.Char('SO Number', compute='_get_so_num')
+
+    @api.depends('group_id')
+    def _get_so_num(self):
+        for record in self:
+            record.so_num = record.group_id.name
+
+
 
     @api.depends('move_line_ids_without_package.qty_done', 'move_line_ids_without_package.product_uom_qty', 'state')
     def _compute_delivery_status_detail(self):
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 78594375..cc9469cb 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -180,6 +180,7 @@
                            'required': [['is_internal_use', '=', True]]
                            }"
                     />
+                    <field name="so_num"/>
                 </field>
                 <field name="group_id" position="before">
                     <field name="date_reserved"/>
-- 
cgit v1.2.3


From 215411bc6cf4413941f978e4bf4d2f0658f8bd58 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 3 Nov 2025 12:06:14 +0700
Subject: <Miqdad> uom coretax id

---
 indoteknik_custom/__manifest__.py    |  1 +
 indoteknik_custom/models/__init__.py |  1 +
 indoteknik_custom/models/uom_uom.py  |  6 ++++++
 indoteknik_custom/views/uom_uom.xml  | 14 ++++++++++++++
 4 files changed, 22 insertions(+)
 create mode 100644 indoteknik_custom/models/uom_uom.py
 create mode 100644 indoteknik_custom/views/uom_uom.xml

diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py
index 7a179ce3..cf4d4ce3 100755
--- a/indoteknik_custom/__manifest__.py
+++ b/indoteknik_custom/__manifest__.py
@@ -191,6 +191,7 @@
         'views/sj_tele.xml',
         'views/close_tempo_mail_template.xml',
         'views/domain_apo.xml',
+        'views/uom_uom.xml',
     ],
     'demo': [],
     'css': [],
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index 165dae4e..6e1ef2e0 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -163,3 +163,4 @@ from . import letter_receivable
 from . import sj_tele
 from . import partial_delivery
 from . import domain_apo
+from . import uom_uom
\ No newline at end of file
diff --git a/indoteknik_custom/models/uom_uom.py b/indoteknik_custom/models/uom_uom.py
new file mode 100644
index 00000000..32e53d73
--- /dev/null
+++ b/indoteknik_custom/models/uom_uom.py
@@ -0,0 +1,6 @@
+from odoo import fields, models, api, _
+
+class Uom(models.Model):
+    _inherit = 'uom.uom'
+
+    coretax_id = fields.Char(string='Coretax ID')
diff --git a/indoteknik_custom/views/uom_uom.xml b/indoteknik_custom/views/uom_uom.xml
new file mode 100644
index 00000000..a7fb55e5
--- /dev/null
+++ b/indoteknik_custom/views/uom_uom.xml
@@ -0,0 +1,14 @@
+<odoo>
+    <data>
+        <record id="uom_form_view_inherit" model="ir.ui.view">
+        <field name="name">Uom</field>
+        <field name="model">uom.uom</field>
+        <field name="inherit_id" ref="uom.product_uom_form_view"/>
+        <field name="arch" type="xml">
+            <field name="rounding" position="after">
+                <field name="coretax_id"/>
+            </field>
+        </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From f820ab9df141389af244a36b093f8a119a4b2004 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 3 Nov 2025 14:00:47 +0700
Subject: push

---
 indoteknik_custom/report/purchase_report.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index 23fa4d52..0c23edd3 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -61,9 +61,9 @@
                         <td style="width:50%; border:1px solid #ccc; border-radius:8px; padding:10px; background:#fcfcfc; vertical-align:top;">
                             <strong style="color:#d32f2f;">Alamat Pengiriman</strong><br/>
                             PT. Indoteknik Dotcom Gemilang<br/>
-                            Jl. Bandengan Utara Komp A 8 B
-                            RT. Penjaringan, Kec. Penjaringan, Jakarta
-                            (BELAKANG INDOMARET)<br/>
+                            JALAN BANDENGAN UTARA 85A NO.8-9 RT. 003 RW. 						
+                            016, PENJARINGAN, PENJARINGAN, KOTA ADM. 						
+                            JAKARTA UTARA, DKI JAKARTA<br/>
                             Daerah Khusus Ibukota Jakarta 14440
                         </td>
                         <td style="width:50%; border:1px solid #ccc; border-radius:8px; padding:10px; background:#fcfcfc; vertical-align:top;">
-- 
cgit v1.2.3


From da34fa99cf4816dbd3c6e9f1a2e47ec19059b765 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 3 Nov 2025 14:22:45 +0700
Subject: (andri) fix description PO

---
 indoteknik_custom/report/purchase_report.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index 23fa4d52..9c0c3983 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -97,7 +97,8 @@
                                     <!-- TEKS -->
                                     <div style="display:flex; flex-direction:column; flex:1;">
                                         <span style="font-weight:bold; margin-bottom:2px;">
-                                            <t t-esc="line_index + 1"/>. <t t-esc="line.product_id.display_name"/>
+                                            <t t-esc="line_index + 1"/>. <t t-esc="line.name"/>
+                                            <!-- <t t-esc="line_index + 1"/>. <t t-esc="line.product_id.display_name"/> -->
                                         </span>
                                     </div>
                                 </td>
-- 
cgit v1.2.3


From 40df41c64bdf3c307720d1695240e1534f40b08b Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 3 Nov 2025 14:52:10 +0700
Subject: push

---
 indoteknik_custom/report/purchase_report.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index 673c6924..9c0c3983 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -61,9 +61,9 @@
                         <td style="width:50%; border:1px solid #ccc; border-radius:8px; padding:10px; background:#fcfcfc; vertical-align:top;">
                             <strong style="color:#d32f2f;">Alamat Pengiriman</strong><br/>
                             PT. Indoteknik Dotcom Gemilang<br/>
-                            JALAN BANDENGAN UTARA 85A NO.8-9 RT. 003 RW. 						
-                            016, PENJARINGAN, PENJARINGAN, KOTA ADM. 						
-                            JAKARTA UTARA, DKI JAKARTA<br/>
+                            Jl. Bandengan Utara Komp A 8 B
+                            RT. Penjaringan, Kec. Penjaringan, Jakarta
+                            (BELAKANG INDOMARET)<br/>
                             Daerah Khusus Ibukota Jakarta 14440
                         </td>
                         <td style="width:50%; border:1px solid #ccc; border-radius:8px; padding:10px; background:#fcfcfc; vertical-align:top;">
-- 
cgit v1.2.3


From 0bb7e8ff5eafa5dbc218d547999876bb11e05c69 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 3 Nov 2025 16:14:12 +0700
Subject: push

---
 indoteknik_custom/models/purchase_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 534d8122..c2b15078 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1123,7 +1123,7 @@ class PurchaseOrder(models.Model):
         if not self.not_update_purchasepricelist:
             self.add_product_to_pricelist()
         for line in self.order_line:
-            if not line.product_id.public_categ_ids:
+            if line.product_id.type == 'product' and not line.product_id.categ_id:
                 raise UserError("Product %s kategorinya kosong" % line.product_id.name)
             if not line.product_id.purchase_ok:
                 raise UserError("Terdapat barang yang tidak bisa diproses")
-- 
cgit v1.2.3


From d3626a4773647ef1910b66fcc8c981dcab562c65 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 4 Nov 2025 15:20:18 +0700
Subject: (andri) add cbd lock date & fix seq PUM reimburse

---
 indoteknik_custom/models/res_partner.py | 1 +
 indoteknik_custom/views/ir_sequence.xml | 2 ++
 indoteknik_custom/views/res_partner.xml | 1 +
 3 files changed, 4 insertions(+)

diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index ef1a5cf4..f80bbcb6 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -182,6 +182,7 @@ class ResPartner(models.Model):
     payment_history_url = fields.Text(string='Payment History URL')
 
     is_cbd_locked = fields.Boolean("Locked to CBD?", default=False, tracking=True, help="Jika dicentang, maka partner ini terkunci pada payment term CBD karena memiliki invoice yang sudah jatuh tempo lebih dari 30 hari.")
+    cbd_lock_date = fields.Datetime("CBD Lock Date", tracking=True, help="Tanggal ketika partner ini dikunci pada payment term CBD.")
 
 
     @api.model
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index dbdbc3c0..541921b9 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -226,6 +226,7 @@
             <field name="padding">4</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
+            <field name="use_date_range" eval="True"/>
             <field name="active">True</field>
         </record>
 
@@ -236,6 +237,7 @@
             <field name="padding">4</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
+            <field name="use_date_range" eval="True"/>
             <field name="active">True</field>
         </record>
 
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 72751187..8378bf34 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -23,6 +23,7 @@
                 <field name="property_payment_term_id" position="after">
                     <field name="previous_payment_term_id" readonly="1"/>
                     <field name="is_cbd_locked" readonly="1"/>
+                    <field name="cbd_lock_date" readonly="1"/>
                     <field name="user_payment_terms_sales" readonly="1"/>
                     <field name="date_payment_terms_sales" readonly="1"/>
                 </field>
-- 
cgit v1.2.3


From 9c76d76fedc18416eeef7335534847f67fff7814 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 4 Nov 2025 15:27:33 +0700
Subject: (andri) fix seq refund

---
 indoteknik_custom/views/ir_sequence.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 541921b9..46148606 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -248,6 +248,7 @@
             <field name="padding">4</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
+            <field name="use_date_range" eval="True"/>
             <field name="active">True</field>
         </record>
 
-- 
cgit v1.2.3


From cabe184a38a6a96b9557ff7debb2e9165894a7b6 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 5 Nov 2025 14:43:55 +0700
Subject: push

---
 indoteknik_custom/models/sale_order.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 1eba2808..d7b0ccee 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2342,11 +2342,6 @@ class SaleOrder(models.Model):
             #     return self._create_notification_action('Notification',
             #                                             'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension')
             
-            if not order.with_context(ask_approval=True)._is_request_to_own_team_leader():
-                return self._create_notification_action(
-                    'Peringatan',
-                    'Hanya bisa konfirmasi SO tim Anda.'
-                )
             if order._requires_approval_margin_leader():
                 order.approval_status = 'pengajuan2'
                 return self._create_approval_notification('Pimpinan')
@@ -2362,6 +2357,12 @@ class SaleOrder(models.Model):
                 self.check_limit_so_to_invoice()
                 order.approval_status = 'pengajuan1'
                 return self._create_approval_notification('Team Sales')
+            
+            if not order.with_context(ask_approval=True)._is_request_to_own_team_leader():
+                return self._create_notification_action(
+                    'Peringatan',
+                    'Hanya bisa konfirmasi SO tim Anda.'
+                )
 
             raise UserError("Bisa langsung Confirm")
 
@@ -2716,11 +2717,12 @@ class SaleOrder(models.Model):
         if user.is_leader or user.is_sales_manager:
             return True
 
+        if self.env.context.get("ask_approval") and user.id in (3401, 20, 3988):
+            return True
+        
         if not self.env.context.get("ask_approval") and user.id in (3401, 20, 3988, 17340): # admin (fida, nabila, ninda)
             raise UserError("Yahaha gabisa confirm so, minta ke sales nya ajah")
         
-        if self.env.context.get("ask_approval") and user.id in (3401, 20, 3988):
-            return True
         
         salesperson_id = self.user_id.id
         approver_id = user.id
-- 
cgit v1.2.3


From 89fe1e885966d46b1e96829d3ecc1c009e0514b8 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 5 Nov 2025 18:15:14 +0700
Subject: <miqdad> disable show description for PO altama

---
 indoteknik_custom/models/purchase_order.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index c2b15078..b9211276 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -118,9 +118,18 @@ class PurchaseOrder(models.Model):
 
     show_description = fields.Boolean(
         string='Show Description',
-        default=True
+        compute='_compute_show_description'
     )
-    
+
+    @api.depends('show_description')
+    def _compute_show_description(self):
+        for order in self:
+            # Show desc false for altama only
+            if order.partner_id == 5571:
+                order.show_description = False
+            else:
+                order.show_description = True
+
     @api.onchange('show_description')
     def onchange_show_description(self):
         if self.show_description == True:
-- 
cgit v1.2.3


From 3ff3ddc67d4664871314462fb184a6fe369f3a63 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 5 Nov 2025 18:54:45 +0700
Subject: <miqdad> disable show description for PO altama

---
 indoteknik_custom/models/purchase_order.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index b9211276..8772dea9 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -118,17 +118,17 @@ class PurchaseOrder(models.Model):
 
     show_description = fields.Boolean(
         string='Show Description',
-        compute='_compute_show_description'
+        compute='_compute_show_description',
+        default=True
     )
 
-    @api.depends('show_description')
+    @api.depends('partner_id')
     def _compute_show_description(self):
         for order in self:
-            # Show desc false for altama only
-            if order.partner_id == 5571:
+            if order.partner_id.id == 5571:
                 order.show_description = False
             else:
-                order.show_description = True
+                order.show_description = order.show_description
 
     @api.onchange('show_description')
     def onchange_show_description(self):
-- 
cgit v1.2.3


From ddc06e464075c316de8f236e0e037dd964a972e3 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 6 Nov 2025 10:16:52 +0700
Subject: <Miqdad> add new field

---
 indoteknik_custom/models/stock_picking.py      | 44 +++++++++++++++-----------
 indoteknik_custom/security/ir.model.access.csv |  1 +
 indoteknik_custom/views/stock_picking.xml      | 19 +++++++++--
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index c17fdbd5..04847be8 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -89,6 +89,7 @@ class StockPicking(models.Model):
         readonly=True,
         related="id",
     )
+    sj_documentations = fields.One2many('stock.picking.sj.document','picking_id', string='Dokumentasi SJ (Multi)')
     sj_documentation = fields.Binary(string="Dokumentasi Surat Jalan")
     paket_documentation = fields.Binary(string="Dokumentasi Paket")
     dispatch_documentation = fields.Binary(string="Dokumentasi Dispatch")
@@ -205,8 +206,6 @@ class StockPicking(models.Model):
         for record in self:
             record.so_num = record.group_id.name
 
-
-
     @api.depends('move_line_ids_without_package.qty_done', 'move_line_ids_without_package.product_uom_qty', 'state')
     def _compute_delivery_status_detail(self):
         for picking in self:
@@ -468,7 +467,6 @@ class StockPicking(models.Model):
         except ValueError:
             return False
 
-
     def action_get_kgx_pod(self, shipment=False):
         self.ensure_one()
 
@@ -1189,7 +1187,8 @@ class StockPicking(models.Model):
         self.sale_id.date_doc_kirim = self.date_doc_kirim
 
     def action_assign(self):
-        if self.env.context.get('default_picking_type_id') and ('BU/INPUT' not in self.name or 'BU/PUT' not in self.name):
+        if self.env.context.get('default_picking_type_id') and (
+                'BU/INPUT' not in self.name or 'BU/PUT' not in self.name):
             pickings_to_assign = self.filtered(
                 lambda p: not (p.sale_id and p.sale_id.hold_outgoing)
             )
@@ -1205,18 +1204,15 @@ class StockPicking(models.Model):
 
         return res
 
-
     def ask_approval(self):
         # if self.env.user.is_accounting:
         # if self.env.user.is_accounting and self.location_id.id == 57 or self.location_id == 57 and self.approval_status in ['pengajuan1', ''] and 'BU/IU' in self.name and self.approval_status == 'pengajuan1':
         #         raise UserError("Bisa langsung set ke approval logistik")
         if self.env.user.is_accounting and self.approval_status == "pengajuan2" and 'BU/IU' in self.name:
             raise UserError("Tidak perlu ask approval sudah approval logistik")
-        if self.env.user.is_logistic_approver and self.location_id.id == 57 or self.location_id== 57 and self.approval_status == 'pengajuan2' and 'BU/IU' in self.name:
+        if self.env.user.is_logistic_approver and self.location_id.id == 57 or self.location_id == 57 and self.approval_status == 'pengajuan2' and 'BU/IU' in self.name:
             raise UserError("Bisa langsung Validate")
 
-
-
         # for calendar distribute only
         # if self.is_internal_use:
         #     stock_move_lines = self.env['stock.move.line'].search([
@@ -1239,7 +1235,6 @@ class StockPicking(models.Model):
                     raise UserError("Qty tidak boleh 0")
             pick.approval_status = 'pengajuan1'
 
-
     def ask_receipt_approval(self):
         if self.env.user.is_logistic_approver:
             raise UserError('Bisa langsung validate tanpa Ask Receipt')
@@ -1405,7 +1400,7 @@ class StockPicking(models.Model):
                 and self.create_date > threshold_datetime
                 and not self.so_lama):
             raise UserError(_("Tidak ada scan koli! Harap periksa kembali."))
-        
+
         if 'BU/OUT/' in self.name:
             self.driver_departure_date = datetime.datetime.utcnow()
 
@@ -1447,13 +1442,16 @@ class StockPicking(models.Model):
         # if self.is_internal_use and not self.env.user.is_logistic_approver and self.location_id.id == 57 and self.approval_status == 'pengajuan2':
         #     raise UserError("Harus di Approve oleh Logistik")
 
-        if self.is_internal_use and self.approval_status in ['pengajuan1', '', False] and 'BU/IU' in self.name and self.is_bu_iu == True:
+        if self.is_internal_use and self.approval_status in ['pengajuan1', '',
+                                                             False] and 'BU/IU' in self.name and self.is_bu_iu == True:
             raise UserError("Tidak Bisa Validate, set approval status ke approval logistik terlebih dahhulu")
 
-        if self.is_internal_use and not self.env.user.is_logistic_approver and self.approval_status in ['pengajuan2'] and self.is_bu_iu == True and 'BU/IU' in self.name:
+        if self.is_internal_use and not self.env.user.is_logistic_approver and self.approval_status in [
+            'pengajuan2'] and self.is_bu_iu == True and 'BU/IU' in self.name:
             raise UserError("Harus di Approve oleh Logistik")
 
-        if self.is_internal_use and not self.env.user.is_accounting and self.approval_status in ['pengajuan1', '', False] and self.is_bu_iu == False:
+        if self.is_internal_use and not self.env.user.is_accounting and self.approval_status in ['pengajuan1', '',
+                                                                                                 False] and self.is_bu_iu == False:
             raise UserError("Harus di Approve oleh Accounting")
 
         if self.picking_type_id.id == 28 and not self.env.user.is_logistic_approver:
@@ -1479,7 +1477,6 @@ class StockPicking(models.Model):
             current_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
             self.date_reserved = current_time
 
-
         # Validate Qty Demand Can't higher than Qty Product
         if self.location_dest_id.id == 58 and 'BU/INPUT/' in self.name:
             for move in self.move_ids_without_package:
@@ -1880,7 +1877,8 @@ class StockPicking(models.Model):
                     'name': move_line.product_id.name,
                     'code': move_line.product_id.default_code,
                     'qty': move_line.qty_done,
-                    'image': self.env['ir.attachment'].api_image('product.template', 'image_128', move_line.product_id.product_tmpl_id.id),
+                    'image': self.env['ir.attachment'].api_image('product.template', 'image_128',
+                                                                 move_line.product_id.product_tmpl_id.id),
                 })
 
         response = {
@@ -2246,7 +2244,6 @@ class CheckProduct(models.Model):
     _order = 'picking_id, id'
     _inherit = ['barcodes.barcode_events_mixin']
 
-
     picking_id = fields.Many2one(
         'stock.picking',
         string='Picking Reference',
@@ -2699,8 +2696,6 @@ class ScanKoli(models.Model):
                             out_move.qty_done += qty_to_assign
                             qty_koli -= qty_to_assign
 
-
-
     def _reset_qty_done_if_no_scan(self, picking_id):
         product_bu_pick = self.env['stock.move.line'].search([('picking_id', '=', picking_id)])
 
@@ -2759,4 +2754,15 @@ class WarningModalWizard(models.TransientModel):
     def action_continue(self):
         if self.picking_id:
             return self.picking_id.with_context(skip_koli_check=True).button_validate()
-        return {'type': 'ir.actions.act_window_close'}
\ No newline at end of file
+        return {'type': 'ir.actions.act_window_close'}
+
+
+class StockPickingSjDocument(models.Model):
+    _name = 'stock.picking.sj.document'
+    _description = 'Dokumentasi Surat Jalan (Multi)'
+    _order = 'sequence, id'
+    _rec_name = 'id'
+
+    picking_id = fields.Many2one('stock.picking', required=True, ondelete='cascade')
+    image = fields.Binary('Gambar', required=True, attachment=True)
+    sequence = fields.Integer('Urutan', default=10)
\ No newline at end of file
diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index c01271d3..dadc2c82 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -210,3 +210,4 @@ access_unpaid_invoice_view,access.unpaid.invoice.view,model_unpaid_invoice_view,
 access_surat_piutang_user,surat.piutang user,model_surat_piutang,,1,1,1,1
 access_surat_piutang_line_user,surat.piutang.line user,model_surat_piutang_line,,1,1,1,1
 access_sj_tele,access.sj.tele,model_sj_tele,base.group_system,1,1,1,1
+access_stock_picking_sj_document,stock.picking.sj.document,model_stock_picking_sj_document,base.group_system,1,1,1,1
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index cc9469cb..2925cf2c 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -166,7 +166,7 @@
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
                     <field name="invoice_status"/>
-                    <field name="is_bu_iu" />
+                    <field name="is_bu_iu"/>
                     <field name="approval_status" attrs="{'invisible': [('is_bu_iu', '=', False)]}"/>
                     <field name="date_doc_kirim" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
                     <field name="summary_qty_operation"/>
@@ -249,6 +249,16 @@
                                        attrs="{'invisible': [('select_shipping_option_so', '=', 'biteship')]}"/>
                                 <field name="driver_id"/>
                                 <field name='sj_return_date'/>
+                                <field name="sj_documentations" context="{'default_picking_id': active_id}">
+                                    <tree editable="bottom">
+                                        <field name="image" widget="image" options="{'size':[128,128]}"/>
+                                    </tree>
+                                    <form>
+                                        <group>
+                                            <field name="image" widget="image" options="{'size':[512,512]}"/>
+                                        </group>
+                                    </form>
+                                </field>
                                 <field name="sj_documentation" widget="image"/>
                                 <field name="paket_documentation" widget="image"/>
                                 <field name="dispatch_documentation" widget="image"/>
@@ -402,7 +412,8 @@
                     <field name="qty_yang_mau_dikirim"/>
                     <field name="qty_terkirim"/>
                     <field name="qty_gantung"/>
-                    <field name="delivery_status" widget="badge" options="{'colors': {'full': 'success', 'partial': 'warning', 'partial_final': 'danger'}}"/>
+                    <field name="delivery_status" widget="badge"
+                           options="{'colors': {'full': 'success', 'partial': 'warning', 'partial_final': 'danger'}}"/>
                 </tree>
             </field>
         </record>
@@ -426,7 +437,9 @@
                 <form string="Peringatan Koli Belum Diperiksa">
                     <sheet>
                         <div class="oe_title">
-                            <h2><span>⚠️ Perhatian!</span></h2>
+                            <h2>
+                                <span>⚠️ Perhatian!</span>
+                            </h2>
                         </div>
                         <group>
                             <field name="message" readonly="1" nolabel="1" widget="text"/>
-- 
cgit v1.2.3


From be3c90b805dec1e178aa8cd70c187c79e3dd8443 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 6 Nov 2025 10:39:21 +0700
Subject: <Miqdad> cr ask approval admin

---
 indoteknik_custom/models/sale_order.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index d7b0ccee..ff79761c 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2363,6 +2363,15 @@ class SaleOrder(models.Model):
                     'Peringatan',
                     'Hanya bisa konfirmasi SO tim Anda.'
                 )
+            if self.env.user.id in  (3401, 20, 3988, 17340):
+                if self.total_percent_margin <= 15:
+                   self._requires_approval_margin_leader()
+                   self.approval_status = 'pengajuan2'
+                elif self.total_percent_margin < 18:
+                    self._requires_approval_margin_manager()
+                    self.approval_status = 'pengajuan1'
+                elif 18 <= self.total_percent_margin <= 24:
+                    self._requires_approval_team_sales()
 
             raise UserError("Bisa langsung Confirm")
 
-- 
cgit v1.2.3


From 73908f6f60b4c5f3d7b7cd3a1a3ab04495de2047 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 6 Nov 2025 13:38:58 +0700
Subject: <Miqdad> cr ask approval admin

---
 indoteknik_custom/models/sale_order.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index ff79761c..73af811b 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2363,15 +2363,6 @@ class SaleOrder(models.Model):
                     'Peringatan',
                     'Hanya bisa konfirmasi SO tim Anda.'
                 )
-            if self.env.user.id in  (3401, 20, 3988, 17340):
-                if self.total_percent_margin <= 15:
-                   self._requires_approval_margin_leader()
-                   self.approval_status = 'pengajuan2'
-                elif self.total_percent_margin < 18:
-                    self._requires_approval_margin_manager()
-                    self.approval_status = 'pengajuan1'
-                elif 18 <= self.total_percent_margin <= 24:
-                    self._requires_approval_team_sales()
 
             raise UserError("Bisa langsung Confirm")
 
@@ -2712,7 +2703,7 @@ class SaleOrder(models.Model):
     
     def _requires_approval_team_sales(self):
         return (
-            18 <= self.total_percent_margin <= 24
+            self.total_percent_margin >= 18
             and self.env.user.id not in [11, 9, 375]  # Eko, Ade, Putra
             and not self.env.user.is_sales_manager
             and not self.env.user.is_leader
-- 
cgit v1.2.3


From af30e94cff35eec4b71cb89fbe7a9a4f654480cb Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 6 Nov 2025 13:40:28 +0700
Subject: <Miqdad> cr ask approval admin

---
 indoteknik_custom/models/sale_order.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index ff79761c..1d07a1ff 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2363,15 +2363,6 @@ class SaleOrder(models.Model):
                     'Peringatan',
                     'Hanya bisa konfirmasi SO tim Anda.'
                 )
-            if self.env.user.id in  (3401, 20, 3988, 17340):
-                if self.total_percent_margin <= 15:
-                   self._requires_approval_margin_leader()
-                   self.approval_status = 'pengajuan2'
-                elif self.total_percent_margin < 18:
-                    self._requires_approval_margin_manager()
-                    self.approval_status = 'pengajuan1'
-                elif 18 <= self.total_percent_margin <= 24:
-                    self._requires_approval_team_sales()
 
             raise UserError("Bisa langsung Confirm")
 
@@ -2712,7 +2703,8 @@ class SaleOrder(models.Model):
     
     def _requires_approval_team_sales(self):
         return (
-            18 <= self.total_percent_margin <= 24
+            # 18 <= self.total_percent_margin <= 24
+            self.total_percent_margin >= 18
             and self.env.user.id not in [11, 9, 375]  # Eko, Ade, Putra
             and not self.env.user.is_sales_manager
             and not self.env.user.is_leader
-- 
cgit v1.2.3


From aad9e13e0a1908dc8d14d86dfc67bdf9f8e006e7 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 6 Nov 2025 14:49:02 +0700
Subject: <Miqdad> api

---
 indoteknik_api/controllers/api_v1/stock_picking.py | 86 ++++++++++++++++++----
 1 file changed, 72 insertions(+), 14 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index fe82e665..a03016c5 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -121,38 +121,96 @@ class StockPicking(controller.Controller):
 
         return self.response(picking.get_tracking_detail())
 
+    from datetime import datetime
+    from odoo import http
+    from odoo.http import request
+
     @http.route(prefix + 'stock-picking/<scanid>/documentation', auth='public', methods=['PUT', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
     def write_partner_stock_picking_documentation(self, scanid, **kw):
-        sj_document = kw.get('sj_document') if 'sj_document' in kw else None
         paket_document = kw.get('paket_document') if 'paket_document' in kw else None
         dispatch_document = kw.get('dispatch_document') if 'dispatch_document' in kw else None
-        self_pu= kw.get('self_pu') if 'self_pu' in kw else None
+        self_pu = kw.get('self_pu') if 'self_pu' in kw else None
 
         # ===== Cari picking by id / picking_code =====
-        picking_data = False
+        picking = False
         if scanid.isdigit() and int(scanid) < 2147483646:
-            picking_data = request.env['stock.picking'].search([('id', '=', int(scanid))], limit=0)
+            picking = request.env['stock.picking'].search([('id', '=', int(scanid))], limit=0)
+        if not picking:
+            picking = request.env['stock.picking'].search([('picking_code', '=', scanid)], limit=0)
+        if not picking:
+            return self.response(code=403, description='picking not found')
 
-        if not picking_data:
-            picking_data = request.env['stock.picking'].search([('picking_code', '=', scanid)], limit=0)
+        # ===== Ambil MULTIPLE SJ dari form: sj_documentations=...&sj_documentations=... =====
+        form = request.httprequest.form or {}
+        sj_list = form.getlist('sj_documentations')  # list of base64 strings
 
-        if not picking_data:
-            return self.response(code=403, description='picking not found')
+        # fallback: kalau FE kirim single dengan nama yang sama (bukan list)
+        if not sj_list and 'sj_documentations' in kw and kw.get('sj_documentations'):
+            sj_list = [kw.get('sj_documentations')]
 
+        # ===== Tulis field lain yang dikirim (merge, bukan replace) =====
         params = {}
-        if sj_document:
-            params['sj_documentation'] = sj_document
-            if self_pu:
-                params['driver_arrival_date'] = datetime.utcnow()
         if paket_document:
             params['paket_documentation'] = paket_document
             params['driver_arrival_date'] = datetime.utcnow()
         if dispatch_document:
             params['dispatch_documentation'] = dispatch_document
+        if sj_list and self_pu:
+            params['driver_arrival_date'] = datetime.utcnow()
 
-        picking_data.write(params)
-        return self.response({'name': picking_data.name})
+        if params:
+            picking.write(params)
+
+        # ===== Buat child rows utk SEMUA foto SJ ke One2many =====
+        if sj_list:
+            Child = request.env['stock.picking.sj.document'].sudo()
+            # kasih urutan lanjut 10-10
+            seq = (picking.sj_documentations[:1].sequence or 10) if picking.sj_documentations else 10
+            for b64 in sj_list:
+                if not b64:
+                    continue
+                Child.create({
+                    'picking_id': picking.id,
+                    'sequence': seq,
+                    'image': b64,  # base64 tanpa prefix
+                })
+                seq += 10
+
+        return self.response({'name': picking.name})
+
+    # @http.route(prefix + 'stock-picking/<scanid>/documentation', auth='public', methods=['PUT', 'OPTIONS'], csrf=False)
+    # @controller.Controller.must_authorized()
+    # def write_partner_stock_picking_documentation(self, scanid, **kw):
+    #     sj_document = kw.get('sj_document') if 'sj_document' in kw else None
+    #     paket_document = kw.get('paket_document') if 'paket_document' in kw else None
+    #     dispatch_document = kw.get('dispatch_document') if 'dispatch_document' in kw else None
+    #     self_pu= kw.get('self_pu') if 'self_pu' in kw else None
+    #
+    #     # ===== Cari picking by id / picking_code =====
+    #     picking_data = False
+    #     if scanid.isdigit() and int(scanid) < 2147483646:
+    #         picking_data = request.env['stock.picking'].search([('id', '=', int(scanid))], limit=0)
+    #
+    #     if not picking_data:
+    #         picking_data = request.env['stock.picking'].search([('picking_code', '=', scanid)], limit=0)
+    #
+    #     if not picking_data:
+    #         return self.response(code=403, description='picking not found')
+    #
+    #     params = {}
+    #     if sj_document:
+    #         params['sj_documentation'] = sj_document
+    #         if self_pu:
+    #             params['driver_arrival_date'] = datetime.utcnow()
+    #     if paket_document:
+    #         params['paket_documentation'] = paket_document
+    #         params['driver_arrival_date'] = datetime.utcnow()
+    #     if dispatch_document:
+    #         params['dispatch_documentation'] = dispatch_document
+    #
+    #     picking_data.write(params)
+    #     return self.response({'name': picking_data.name})
 
 
     @http.route(prefix + 'webhook/biteship', type='json', auth='public', methods=['POST'], csrf=False)
-- 
cgit v1.2.3


From dd51ce73e27cd7639b512a219e7bc68bb467b4d3 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 6 Nov 2025 15:04:05 +0700
Subject: <Miqdad> show desc false altama

---
 indoteknik_custom/models/automatic_purchase.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py
index d9ec17f4..012d680a 100644
--- a/indoteknik_custom/models/automatic_purchase.py
+++ b/indoteknik_custom/models/automatic_purchase.py
@@ -239,7 +239,8 @@ class AutomaticPurchase(models.Model):
                 'picking_type_id': 28,
                 'date_order': current_time,
                 'from_apo': True,
-                'note_description': 'Automatic PO'
+                'note_description': 'Automatic PO',
+                'show_description': False if vendor_id.id == 5571 else True,
             }
             new_po = self.env['purchase.order'].create(param_header)
 
-- 
cgit v1.2.3


From 449a3f3a3acaeb0b950f57daee1067d70d483d90 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 6 Nov 2025 15:04:16 +0700
Subject: <Miqdad> show desc false altama

---
 indoteknik_custom/models/purchase_order.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 8772dea9..4475e777 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -118,17 +118,9 @@ class PurchaseOrder(models.Model):
 
     show_description = fields.Boolean(
         string='Show Description',
-        compute='_compute_show_description',
         default=True
     )
 
-    @api.depends('partner_id')
-    def _compute_show_description(self):
-        for order in self:
-            if order.partner_id.id == 5571:
-                order.show_description = False
-            else:
-                order.show_description = order.show_description
 
     @api.onchange('show_description')
     def onchange_show_description(self):
-- 
cgit v1.2.3


From ee9706c1f34c88ca2cfc32dbe7a90c38731166b1 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 6 Nov 2025 15:12:45 +0700
Subject: <Miqdad> show desc false altama

---
 indoteknik_custom/models/automatic_purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py
index 012d680a..ce0328c4 100644
--- a/indoteknik_custom/models/automatic_purchase.py
+++ b/indoteknik_custom/models/automatic_purchase.py
@@ -240,7 +240,7 @@ class AutomaticPurchase(models.Model):
                 'date_order': current_time,
                 'from_apo': True,
                 'note_description': 'Automatic PO',
-                'show_description': False if vendor_id.id == 5571 else True,
+                'show_description': False if vendor_id == 5571 else True,
             }
             new_po = self.env['purchase.order'].create(param_header)
 
-- 
cgit v1.2.3


From 062c606f4c31ee0966a6c08f4f3de52d719df883 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 6 Nov 2025 15:35:54 +0700
Subject: <Miqdad> update

---
 indoteknik_api/controllers/api_v1/stock_picking.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index a03016c5..c19812f5 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -121,10 +121,6 @@ class StockPicking(controller.Controller):
 
         return self.response(picking.get_tracking_detail())
 
-    from datetime import datetime
-    from odoo import http
-    from odoo.http import request
-
     @http.route(prefix + 'stock-picking/<scanid>/documentation', auth='public', methods=['PUT', 'OPTIONS'], csrf=False)
     @controller.Controller.must_authorized()
     def write_partner_stock_picking_documentation(self, scanid, **kw):
@@ -149,7 +145,6 @@ class StockPicking(controller.Controller):
         if not sj_list and 'sj_documentations' in kw and kw.get('sj_documentations'):
             sj_list = [kw.get('sj_documentations')]
 
-        # ===== Tulis field lain yang dikirim (merge, bukan replace) =====
         params = {}
         if paket_document:
             params['paket_documentation'] = paket_document
@@ -162,10 +157,8 @@ class StockPicking(controller.Controller):
         if params:
             picking.write(params)
 
-        # ===== Buat child rows utk SEMUA foto SJ ke One2many =====
         if sj_list:
             Child = request.env['stock.picking.sj.document'].sudo()
-            # kasih urutan lanjut 10-10
             seq = (picking.sj_documentations[:1].sequence or 10) if picking.sj_documentations else 10
             for b64 in sj_list:
                 if not b64:
@@ -173,7 +166,7 @@ class StockPicking(controller.Controller):
                 Child.create({
                     'picking_id': picking.id,
                     'sequence': seq,
-                    'image': b64,  # base64 tanpa prefix
+                    'image': b64,
                 })
                 seq += 10
 
-- 
cgit v1.2.3


From 3f905516b4b0b6573ebdf67f18582f20b023f7f6 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 6 Nov 2025 16:32:57 +0700
Subject: <Miqdad> update

---
 indoteknik_custom/models/sale_order.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 1d07a1ff..31662fb4 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2597,7 +2597,7 @@ class SaleOrder(models.Model):
                 order.approval_status = 'pengajuan1'
                 return self._create_approval_notification('Sales Manager')
             elif order._requires_approval_team_sales():
-                order.approval_status = 'pengajuan1'
+                # order.approval_status = 'pengajuan1'
                 return self._create_approval_notification('Team Sales')
 
             order.approval_status = 'approved'
@@ -2703,8 +2703,8 @@ class SaleOrder(models.Model):
     
     def _requires_approval_team_sales(self):
         return (
-            # 18 <= self.total_percent_margin <= 24
-            self.total_percent_margin >= 18
+            18 <= self.total_percent_margin <= 24
+            # self.total_percent_margin >= 18
             and self.env.user.id not in [11, 9, 375]  # Eko, Ade, Putra
             and not self.env.user.is_sales_manager
             and not self.env.user.is_leader
-- 
cgit v1.2.3


From 459e34a6f96ed12522036bb12da2e0488581c016 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 7 Nov 2025 13:16:34 +0700
Subject: <Miqdad> CR nathan stock picking

---
 indoteknik_custom/models/sale_order.py    |  1 +
 indoteknik_custom/models/stock_picking.py | 22 ++++++++++++++++++++--
 indoteknik_custom/views/sale_order.xml    |  1 +
 indoteknik_custom/views/stock_picking.xml |  5 +++--
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 31662fb4..ef6318da 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -398,6 +398,7 @@ class SaleOrder(models.Model):
         compute="_compute_partner_is_cbd_locked"
     )
     internal_notes_contact = fields.Text(related='partner_id.comment', string="Internal Notes", readonly=True, help="Internal Notes dari contact utama customer.")
+    is_so_fiktif = fields.Boolean('SO Fiktif?')
 
     def action_open_partial_delivery_wizard(self):
         # raise UserError("Fitur ini sedang dalam pengembangan")
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index c17fdbd5..8fefcf81 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -199,14 +199,19 @@ class StockPicking(models.Model):
         ('full', 'Full'),
     ], string='Delivery Status', compute='_compute_delivery_status_detail', store=False)
     so_num = fields.Char('SO Number', compute='_get_so_num')
+    is_so_fiktif = fields.Boolean('SO Fiktif?', compute='_compute_is_so_fiktif')
+
+    @api.depends('sale_id.is_so_fiktif')
+    def _compute_is_so_fiktif(self):
+        for picking in self:
+            picking.is_so_fiktif = picking.sale_id.is_so_fiktif if picking.sale_id else False
+
 
     @api.depends('group_id')
     def _get_so_num(self):
         for record in self:
             record.so_num = record.group_id.name
 
-
-
     @api.depends('move_line_ids_without_package.qty_done', 'move_line_ids_without_package.product_uom_qty', 'state')
     def _compute_delivery_status_detail(self):
         for picking in self:
@@ -1383,6 +1388,8 @@ class StockPicking(models.Model):
         group_id = self.env.ref('indoteknik_custom.group_role_merchandiser').id
         users_in_group = self.env['res.users'].search([('groups_id', 'in', [group_id])])
         active_model = self.env.context.get('active_model')
+        if self.is_so_fiktif == True:
+            raise UserError("SO Fiktif tidak bisa di validate")
         if self.location_id.id == 47 and self.env.user.id not in users_in_group.mapped(
                 'id') and self.state_approve_md != 'done':
             self.state_approve_md = 'waiting' if self.state_approve_md != 'pending' else 'pending'
@@ -1562,6 +1569,10 @@ class StockPicking(models.Model):
         elif self.tukar_guling_po_id:
             self.tukar_guling_po_id.update_doc_state()
 
+        user = self.env.user
+        if not user.has_group('indoteknik_custom.group_role_logistic'):
+            raise UserWarning('Validate hnaya bisa di lakukan oleh logistik')
+
         return res
 
     def automatic_reserve_product(self):
@@ -1732,6 +1743,13 @@ class StockPicking(models.Model):
                     'indoteknik_custom.group_role_logistic') and self.picking_type_code == 'outgoing':
                 raise UserError("Button ini hanya untuk Logistik")
 
+        if len(self.check_product_lines) >= 1:
+            raise UserError("Tidak Bisa cancel karena sudah di check product")
+
+        if not self.env.user.is_logistic_approver and not self.env.user.has_group('indoteknik_custom.group_role_logistic'):
+            if self.name and ('BU/PICK' in self.name or 'BU/OUT' in self.name or 'BU/ORT' in self.name or 'BU/SRT' in self.name):
+                raise UserError("Button ini hanya untuk Logistik")
+
         res = super(StockPicking, self).action_cancel()
         return res
 
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index a540caa7..b2ecc21c 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -130,6 +130,7 @@
                 </field>
                 <field name="approval_status" position="after">
                     <field name="notes"/>
+                    <field name="is_so_fiktif"/>
                 </field>
                 <field name="source_id" position="attributes">
                     <attribute name="invisible">1</attribute>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index cc9469cb..8e1e9d3e 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -147,7 +147,7 @@
                     <attribute name="attrs">{'readonly': [('parent.picking_type_code', '=', 'incoming')]}</attribute>
                 </field> -->
                 <field name="date_done" position="after">
-                    <field name="arrival_time"/>
+                    <field name="arrival_time" attrs="{'invisible': [('picking_type_id', 'in', [29,30])]}"/>
                 </field>
                 <field name="scheduled_date" position="attributes">
                     <attribute name="readonly">1</attribute>
@@ -162,11 +162,12 @@
 
                 <field name="origin" position="after">
                     <!--                    <field name="show_state_approve_md" invisible="1" optional="hide"/>-->
-                    <field name="state_approve_md" widget="badge"/>
+                    <field name="state_approve_md" widget="badge" attrs="{'invisible': [('picking_type_id', 'in', [29,30])]}"/>
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
                     <field name="invoice_status"/>
                     <field name="is_bu_iu" />
+                    <field name="is_so_fiktif" readonly="1"/>
                     <field name="approval_status" attrs="{'invisible': [('is_bu_iu', '=', False)]}"/>
                     <field name="date_doc_kirim" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
                     <field name="summary_qty_operation"/>
-- 
cgit v1.2.3


From f0931f9b846f05a4debc967597bb54f91f9b640a Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 7 Nov 2025 14:53:25 +0700
Subject: <Miqdad> get image from envio

---
 indoteknik_custom/models/stock_picking.py | 35 +++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 8fefcf81..798b4109 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -5,16 +5,16 @@ from collections import defaultdict
 from datetime import timedelta, datetime
 from datetime import timedelta, datetime as waktu
 from itertools import groupby
-import pytz, requests, json, requests
+import pytz, json
 from dateutil import parser
 import datetime
 import hmac
 import hashlib
-import base64
 import requests
 import time
 import logging
 import re
+import base64
 
 _logger = logging.getLogger(__name__)
 
@@ -823,6 +823,37 @@ class StockPicking(models.Model):
                 picking.envio_cod_value = data.get("cod_value", 0.0)
                 picking.envio_cod_status = data.get("cod_status")
 
+                images_data = data.get('images', [])
+                for img in images_data:
+                    image_url = img.get('image')
+                    if image_url:
+                        try:
+                            # Download image from URL
+                            img_response = requests.get(image_url)
+                            img_response.raise_for_status()
+
+                            # Encode image to base64
+                            image_base64 = base64.b64encode(img_response.content)
+
+                            # Create attachment in Odoo
+                            attachment = self.env['ir.attachment'].create({
+                                'name': 'Envio Image',
+                                'type': 'binary',
+                                'datas': image_base64,
+                                'res_model': picking._name,
+                                'res_id': picking.id,
+                                'mimetype': 'image/png',
+                            })
+
+                            # Post log note with attachment
+                            picking.message_post(
+                                body="Image Envio",
+                                attachment_ids=[attachment.id]
+                            )
+
+                        except Exception as e:
+                            picking.message_post(body=f"Gagal ambil image Envio: {str(e)}")
+
                 # Menyimpan log terbaru
                 logs = data.get("logs", [])
                 if logs and isinstance(logs, list) and logs[0]:
-- 
cgit v1.2.3


From e8812897c981a55130c452cc15600a4758ffcffb Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 7 Nov 2025 15:30:15 +0700
Subject: <Miqdad> fix date approve

---
 indoteknik_custom/models/commision.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index a937e2d0..441dd54f 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -423,8 +423,8 @@ class CustomerCommision(models.Model):
     def action_confirm_customer_commision(self):
         jakarta_tz = pytz.timezone('Asia/Jakarta')
         now = datetime.now(jakarta_tz)
-
-        now_naive = now.replace(tzinfo=None)
+        now_utc = now.astimezone(pytz.utc)
+        now_naive = now_utc.replace(tzinfo=None)
 
         if not self.status or self.status == 'draft':
             self.status = 'pengajuan1'
-- 
cgit v1.2.3


From 2cc12f95a1fbc0de8018446cd5e23a35ac892494 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 7 Nov 2025 17:48:14 +0700
Subject: <Miqdad> fix error cancel SO

---
 indoteknik_custom/models/stock_picking.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 798b4109..0178ac33 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1778,8 +1778,10 @@ class StockPicking(models.Model):
             raise UserError("Tidak Bisa cancel karena sudah di check product")
 
         if not self.env.user.is_logistic_approver and not self.env.user.has_group('indoteknik_custom.group_role_logistic'):
-            if self.name and ('BU/PICK' in self.name or 'BU/OUT' in self.name or 'BU/ORT' in self.name or 'BU/SRT' in self.name):
-                raise UserError("Button ini hanya untuk Logistik")
+            for picking in self:
+                if picking.name and ('BU/PICK' in picking.name or 'BU/OUT' in picking.name or 'BU/ORT' in picking.name or 'BU/SRT' in picking.name):
+                    if picking.state not in ['cancel']:
+                        raise UserError("Button ini hanya untuk Logistik")
 
         res = super(StockPicking, self).action_cancel()
         return res
-- 
cgit v1.2.3


From bb7121ab8a7dbdfb104eefbeddc9fb6d4383054b Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Sat, 8 Nov 2025 11:00:09 +0700
Subject: initial commit for branch feature/komisi-sales-internal

---
 indoteknik_custom/__manifest__.py               |   1 +
 indoteknik_custom/models/__init__.py            |   3 +-
 indoteknik_custom/models/commission_internal.py | 129 ++++++++++++++++++++++++
 indoteknik_custom/security/ir.model.access.csv  |   2 +
 indoteknik_custom/views/commission_internal.xml | 105 +++++++++++++++++++
 5 files changed, 239 insertions(+), 1 deletion(-)
 create mode 100644 indoteknik_custom/models/commission_internal.py
 create mode 100644 indoteknik_custom/views/commission_internal.xml

diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py
index cf4d4ce3..66962a24 100755
--- a/indoteknik_custom/__manifest__.py
+++ b/indoteknik_custom/__manifest__.py
@@ -192,6 +192,7 @@
         'views/close_tempo_mail_template.xml',
         'views/domain_apo.xml',
         'views/uom_uom.xml',
+        'views/commission_internal.xml'
     ],
     'demo': [],
     'css': [],
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index 6e1ef2e0..a14c766e 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -163,4 +163,5 @@ from . import letter_receivable
 from . import sj_tele
 from . import partial_delivery
 from . import domain_apo
-from . import uom_uom
\ No newline at end of file
+from . import uom_uom
+from . import commission_internal
diff --git a/indoteknik_custom/models/commission_internal.py b/indoteknik_custom/models/commission_internal.py
new file mode 100644
index 00000000..8a333bda
--- /dev/null
+++ b/indoteknik_custom/models/commission_internal.py
@@ -0,0 +1,129 @@
+from odoo import models, api, fields
+from odoo.exceptions import AccessError, UserError, ValidationError
+from datetime import timedelta, date
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class CommissionInternal(models.Model):
+    _name = 'commission.internal'
+    _description = 'Commission Internal'
+    _order = 'date_doc, id desc'
+    _inherit = ['mail.thread']
+    _rec_name = 'number'
+
+    number = fields.Char(string='Document No', index=True, copy=False, readonly=True)
+    date_doc = fields.Date(string='Document Date', required=True)
+    month = fields.Selection([
+        ('01', 'January'), ('02', 'February'), ('03', 'March'),
+        ('04', 'April'), ('05', 'May'), ('06', 'June'),
+        ('07', 'July'), ('08', 'August'), ('09', 'September'),
+        ('10', 'October'), ('11', 'November'), ('12', 'December')
+    ], string="Commission Month")
+    year = fields.Selection([(str(y), str(y)) for y in range(2025, 2036)], string="Commission Year")
+    description = fields.Char(string='Description')
+    comment = fields.Char(string='Comment')
+    commission_internal_line = fields.One2many('commission.internal.line', 'commission_internal_id', string='Lines',
+                                               auto_join=True, order='account_move_id asc')
+
+    @api.model
+    def create(self, vals):
+        vals['number'] = self.env['ir.sequence'].next_by_code('commission.internal') or '0'
+        result = super(CommissionInternal, self).create(vals)
+        return result
+
+    def _get_commission_internal_bank_account_ids(self):
+        bank_ids = self.env['ir.config_parameter'].sudo().get_param('commission.internal.bank.account.id')
+        if not bank_ids:
+            return []
+        return [int(x.strip()) for x in bank_ids.split(',') if x.strip().isdigit()]
+
+    def _get_period_range(self, period_year, period_month):
+        """Return (date_start, date_end) using separate year and month fields."""
+        self.ensure_one()  # make sure it's called on a single record
+
+        year_str = period_year or ''
+        month_str = period_month or ''
+
+        # Validate both fields exist
+        if not (year_str.isdigit() and month_str.isdigit()):
+            return None, None
+
+        year = int(year_str)
+        month = int(month_str)
+
+        # First day of this month
+        dt_start = date(year, month, 1)
+
+        # Compute first day of next month
+        if month == 12:
+            next_month = date(year + 1, 1, 1)
+        else:
+            next_month = date(year, month + 1, 1)
+
+        # Last day = one day before next month's first day
+        dt_end = next_month - timedelta(days=1)
+
+        return dt_start, dt_end
+
+    def generate_commission_from_generate_ledger(self):
+        if self.commission_internal_line:
+            raise UserError('Harus hapus semua line jika ingin generate ulang')
+        if not self.month:
+            raise UserError('Commission Month harus diisi')
+        if not self.year:
+            raise UserError('Commission Year harus diisi')
+
+        dt_start, dt_end = self._get_period_range(self.year, self.month)
+
+        account_bank_ids = self._get_commission_internal_bank_account_ids()
+        query = [
+            ('move_id.state', '=', 'posted'),
+            ('account_id', 'in', account_bank_ids),
+            ('date', '>=', dt_start),
+            ('date', '<=', dt_end)
+        ]
+        ledgers = self.env['account.move.line'].search(query)
+        count = 0
+        for ledger in ledgers:
+            _logger.info("Read General Ledger Account Move Line %s" % ledger.id)
+            self.env['commission.internal.line'].create([{
+                'commission_internal_id': self.id,
+                'date': ledger.date,
+                'number': ledger.move_id.name,
+                'account_move_id': ledger.move_id.id,
+                'account_move_line_id': ledger.id,
+                'account_id': ledger.account_id.id,
+                'label': ledger.name,
+                'debit': ledger.debit,
+                'credit': ledger.credit,
+                'balance': ledger.balance
+            }])
+            count += 1
+        _logger.info("Commission Internal Line generated %s" % count)
+
+
+class CommissionInternalLine(models.Model):
+    _name = 'commission.internal.line'
+    _description = 'Line'
+    _order = 'number asc, id'
+
+    commission_internal_id = fields.Many2one('commission.internal', string='Internal Ref', required=True,
+                                             ondelete='cascade', index=True, copy=False)
+    date = fields.Date(string='Date')
+    number = fields.Char(string='Number')
+    account_move_id = fields.Many2one('account.move', string='Account Move')
+    account_move_line_id = fields.Many2one('account.move.line', string='Account Move Line')
+    account_id = fields.Many2one('account.account', string='Account')
+    label = fields.Char(string='Label')
+    debit = fields.Float(string='Debit')
+    credit = fields.Float(string='Credit')
+    balance = fields.Float(string='Balance')
+    ongkir = fields.Float(string='Ongkir')
+    refund = fields.Float(string='Refund')
+    pph = fields.Float(string='PPh23')
+    others = fields.Float(string='Others')
+    linenetamt = fields.Float(string='Net Amount')
+    dpp = fields.Float(string='DPP')
+    status = fields.Char(string='Status')
diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index c01271d3..1a799d01 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -164,6 +164,8 @@ access_purchase_order_unlock_wizard,access.purchase.order.unlock.wizard,model_pu
 access_sales_order_koli,access.sales.order.koli,model_sales_order_koli,,1,1,1,1
 access_stock_backorder_confirmation,access.stock.backorder.confirmation,model_stock_backorder_confirmation,,1,1,1,1
 access_warning_modal_wizard,access.warning.modal.wizard,model_warning_modal_wizard,,1,1,1,1
+access_commission_internal,access.commission.internal,model_commission_internal,,1,1,1,1
+access_commission_internal_line,access.commission.internal.line,model_commission_internal_line,,1,1,1,1
 
 access_User_pengajuan_tempo_line,access.user.pengajuan.tempo.line,model_user_pengajuan_tempo_line,,1,1,1,1
 access_user_pengajuan_tempo,access.user.pengajuan.tempo,model_user_pengajuan_tempo,,1,1,1,1
diff --git a/indoteknik_custom/views/commission_internal.xml b/indoteknik_custom/views/commission_internal.xml
new file mode 100644
index 00000000..1489a83b
--- /dev/null
+++ b/indoteknik_custom/views/commission_internal.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="commission_internal_tree" model="ir.ui.view">
+        <field name="name">commission.internal.tree</field>
+        <field name="model">commission.internal</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="number"/>
+                <field name="date_doc"/>
+                <field name="month"/>
+                <field name="year"/>
+                <field name="description"/>
+                <field name="comment"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="commission_internal_form" model="ir.ui.view">
+        <field name="name">commission.internal.form</field>
+        <field name="model">commission.internal</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet string="Header">
+                        <div class="oe_button_box" name="button_box"/>
+                        <group>
+                            <group>
+                                <field name="number"/>
+                                <field name="date_doc"/>
+                                <field name="description"/>
+                                <field name="comment" readonly="1"/>
+                            </group>
+                            <group>
+                                <field name="month"/>
+                                <field name="year"/>
+                                <div>
+                                <button name="generate_commission_from_generate_ledger"
+                                    string="Copy GL"
+                                    type="object"
+                                />
+                                </div>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page id="commission_internal_line_tab" string="Lines">
+                                <field name="commission_internal_line"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="commission_internal_line_tree" model="ir.ui.view">
+        <field name="name">commission.internal.line.tree</field>
+        <field name="model">commission.internal.line</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="date"/>
+                <field name="number"/>
+                <field name="account_move_id" optional="hide"/>
+                <field name="account_move_line_id" optional="hide"/>
+                <field name="label"/>
+                <field name="debit"/>
+                <field name="credit"/>
+                <field name="balance"/>
+                <field name="ongkir"/>
+                <field name="refund"/>
+                <field name="pph"/>
+                <field name="others"/>
+                <field name="linenetamt"/>
+                <field name="dpp"/>
+                <field name="status"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_commission_internal_filter" model="ir.ui.view">
+        <field name="name">commission.internal.list.select</field>
+        <field name="model">commission.internal</field>
+        <field name="priority" eval="15"/>
+        <field name="arch" type="xml">
+            <search string="Search Commission Internal">
+                <field name="number"/>
+           </search>
+        </field>
+    </record>
+
+    <record id="commission_internal_action" model="ir.actions.act_window">
+        <field name="name">Commission Internal</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">commission.internal</field>
+        <field name="search_view_id" ref="view_commission_internal_filter"/>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_commission_internal"
+        name="Commission Internal"
+        action="commission_internal_action"
+        parent="account.menu_finance_reports"
+        sequence="251"/>
+</odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 7efc5a1a9b0f8a8479a9fed03577a76bdba8af22 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Sat, 8 Nov 2025 19:27:23 +0700
Subject: <Miqdad> sync real deliv and deliv addr to stock picking (pick & out)

---
 indoteknik_custom/models/sale_order.py | 41 ++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index ef6318da..bc33e8e6 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -400,6 +400,44 @@ class SaleOrder(models.Model):
     internal_notes_contact = fields.Text(related='partner_id.comment', string="Internal Notes", readonly=True, help="Internal Notes dari contact utama customer.")
     is_so_fiktif = fields.Boolean('SO Fiktif?')
 
+    def action_set_shipping_id(self):
+        for rec in self:
+            bu_pick = self.env['stock.picking'].search([
+                ('state', 'not in', ['cancel']),
+                ('picking_type_id', '=', 30),
+                ('sale_id', '=', rec.id),
+                ('linked_manual_bu_out', '=', False)
+            ])
+            # bu_out = bu_pick_has_out.mapped('linked_manual_bu_out')
+            bu_out = self.env['stock.picking'].search([
+                ('sale_id', '=', rec.id),
+                ('picking_type_id', '=', 29),
+                ('state', 'not in', ['cancel', 'done'])
+            ])
+            bu_pick_has_out = self.env['stock.picking'].search([
+                ('state', 'not in', ['cancel']),
+                ('picking_type_id', '=', 30),
+                ('sale_id', '=', rec.id),
+                ('linked_manual_bu_out.id', '=', bu_out.id),
+                ('linked_manual_bu_out.state', 'not in', ['done', 'cancel'])
+            ])
+            for pick in bu_pick_has_out:
+                linked_out = pick.linked_manual_bu_out
+                if pick.real_shipping_id != rec.real_shipping_id or linked_out.partner_id != rec.partner_shipping_id:
+                    pick.real_shipping_id = rec.real_shipping_id
+                    pick.partner_id = rec.partner_shipping_id
+                    linked_out.partner_id = rec.partner_shipping_id
+                    linked_out.real_shipping_id = rec.real_shipping_id
+                    _logger.info('Updated bu_pick [%s] and bu_out [%s]', pick.name, linked_out.name)
+
+            for pick in bu_pick:
+                if pick.real_shipping_id != rec.real_shipping_id:
+                    pick.real_shipping_id = rec.real_shipping_id
+                    pick.partner_id = rec.partner_shipping_id
+                    bu_out.partner_id = rec.partner_shipping_id
+                    bu_out.real_shipping_id = rec.real_shipping_id
+                    _logger.info('Updated bu_pick [%s] without bu_out', pick.name)
+
     def action_open_partial_delivery_wizard(self):
         # raise UserError("Fitur ini sedang dalam pengembangan")
         self.ensure_one()
@@ -3377,6 +3415,9 @@ class SaleOrder(models.Model):
         #         if updated_vals:
         #             line.write(updated_vals)
 
+
+        if 'real_shipping_id' in vals:
+            self.action_set_shipping_id()
         return res
     
     def button_refund(self):
-- 
cgit v1.2.3


From 1554163f079ad816279ddbf2a244327e4e0b89c1 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Sat, 8 Nov 2025 21:06:42 +0700
Subject: <Miqdad> set uom faktur xml based on coretax id

---
 indoteknik_custom/models/coretax_fatur.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/coretax_fatur.py b/indoteknik_custom/models/coretax_fatur.py
index ce94306f..7e0de919 100644
--- a/indoteknik_custom/models/coretax_fatur.py
+++ b/indoteknik_custom/models/coretax_fatur.py
@@ -147,6 +147,8 @@ class CoretaxFaktur(models.Model):
                 subtotal = line_price_subtotal
                 quantity = line_quantity
                 total_discount = round(line_discount, 2)
+                coretax_id = line.product_uom_id.coretax_id
+                uom_name = line.product_uom_id.name
 
                 # Calculate other tax values
                 otherTaxBase = round(subtotal * (11 / 12), 2) if subtotal else 0
@@ -159,7 +161,7 @@ class CoretaxFaktur(models.Model):
                 ET.SubElement(good_service, 'Opt').text = 'A'
                 ET.SubElement(good_service, 'Code').text = '000000'
                 ET.SubElement(good_service, 'Name').text = line_name
-                ET.SubElement(good_service, 'Unit').text = 'UM.0018'
+                ET.SubElement(good_service, uom_name).text = coretax_id
                 # ET.SubElement(good_service, 'Price').text = str(round(line_price_unit, 2)) if line_price_unit else '0'
                 ET.SubElement(good_service, 'Price').text = str(price_per_unit)
                 ET.SubElement(good_service, 'Qty').text = str(quantity)
-- 
cgit v1.2.3


From 1e3ab6c5d7b34e302d07bdb303982c87aaf59123 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 10 Nov 2025 10:20:58 +0700
Subject: <Miqdad> validasi check product bu input

---
 indoteknik_custom/models/stock_picking.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 0178ac33..eb9d8eda 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1459,6 +1459,9 @@ class StockPicking(models.Model):
         if len(self.check_product_lines) == 0 and 'BU/PICK/' in self.name:
             raise UserError(_("Tidak ada Check Product! Harap periksa kembali."))
 
+        if len(self.check_product_lines) == 0 and 'BU/INPUT/' in self.name:
+            raise UserError(_("Tidak ada Check Product! Harap periksa kembali."))
+
         if self.total_koli > self.total_so_koli:
             raise UserError(_("Total Koli (%s) dan Total SO Koli (%s) tidak sama! Harap periksa kembali.")
                             % (self.total_koli, self.t1otal_so_koli))
-- 
cgit v1.2.3


From c15634a9fba8338c07e3933a893850b8962ce441 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 10 Nov 2025 11:26:49 +0700
Subject: (andri) fix

---
 indoteknik_custom/models/sale_order.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index bc33e8e6..37f8b9cc 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2317,7 +2317,7 @@ class SaleOrder(models.Model):
                     raise UserError("Terdapat DUPLIKASI data pada Product {}".format(line.product_id.display_name))
 
     def sale_order_approve(self):
-        # self.check_duplicate_product()
+        self.check_duplicate_product()
         self.check_product_bom()
         self.check_credit_limit()
         self.check_limit_so_to_invoice()
@@ -2588,7 +2588,7 @@ class SaleOrder(models.Model):
         for order in self:
             order._validate_delivery_amt()
             order._validate_uniform_taxes()
-            # order.check_duplicate_product()
+            order.check_duplicate_product()
             order.check_product_bom()
             order.check_credit_limit()
             order.check_limit_so_to_invoice()
-- 
cgit v1.2.3


From 58aaf106709d00e1c01e2fc004ae5914fa9ceb80 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 10 Nov 2025 14:54:48 +0700
Subject: <Miqdad> show desc PO

---
 indoteknik_custom/report/purchase_report.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index 9c0c3983..208e6472 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -131,7 +131,7 @@
                             </tr>
 
                             <!-- WEBSITE DESCRIPTION -->
-                            <t t-if="line.show_description">
+                            <t t-if="line.show_description == True">
                                 <tr t-attf-style="background-color: #{ '#fef5f5' if line_index % 2 == 0 else '#fffafa' }; ">
                                     <td colspan="6" style="padding: 10px 14px; font-size:10px; line-height:1.3; font-style:italic; color:#555; border-left:1px solid #ccc; border-right:1px solid #ccc; border-bottom:1px solid #ccc;">
                                         <div t-raw="line.product_id.website_description"/>
-- 
cgit v1.2.3


From 40c863af895ecbcc4af7162c0184f017467bafeb Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 10 Nov 2025 14:56:58 +0700
Subject: (andri) open all jenis biaya realisasi

---
 indoteknik_custom/models/advance_payment_request.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index a3a3d20a..6ea1c160 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -846,9 +846,9 @@ class AdvancePaymentUsageLine(models.Model):
     attachment_filename_pdf = fields.Char(string='Filename PDF')
 
     account_id = fields.Many2one(
-        'account.account', string='Jenis Biaya', tracking=3,
-        domain="[('id', 'in', [484, 486, 488, 506, 507, 625, 471, 519, 527, 528, 529, 530, 565])]" # ID Jenis Biaya yang dibutuhkan
+        'account.account', string='Jenis Biaya', tracking=3 # ID Jenis Biaya yang dibutuhkan
     )
+    #     domain="[('id', 'in', [484, 486, 488, 506, 507, 625, 471, 519, 527, 528, 529, 530, 565])]" # ID Jenis Biaya yang dibutuhkan
 
     is_current_user_ap = fields.Boolean(
         string="Is Current User AP",
-- 
cgit v1.2.3


From 43fd0cdc3bd0aab6146a29d4400eafbd792057f0 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 10 Nov 2025 15:08:15 +0700
Subject: <Miqdad> show desc PO

---
 indoteknik_custom/models/automatic_purchase.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py
index ce0328c4..4b0ce325 100644
--- a/indoteknik_custom/models/automatic_purchase.py
+++ b/indoteknik_custom/models/automatic_purchase.py
@@ -284,7 +284,8 @@ class AutomaticPurchase(models.Model):
                     'ending_price': line.last_price,
                     'taxes_id': [(6, 0, [line.taxes_id.id])] if line.taxes_id else False,
                     'so_line_id': sales_match.sale_line_id.id if sales_match else None,
-                    'so_id': sales_match.sale_id.id if sales_match else None
+                    'so_id': sales_match.sale_id.id if sales_match else None,
+                    'show_description': False if vendor_id == 5571 else True,
                 }
                 new_po_line = self.env['purchase.order.line'].create(param_line)
                 line.current_po_id = new_po.id
-- 
cgit v1.2.3


From 85ff81225eb7f5bf9fd82aee072f75abb15fdf51 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 11 Nov 2025 08:58:30 +0700
Subject: <Miqdad> aktivin code ambil uom dari SO

---
 indoteknik_custom/models/stock_move.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index 38cf0199..ff87f911 100644
--- a/indoteknik_custom/models/stock_move.py
+++ b/indoteknik_custom/models/stock_move.py
@@ -282,10 +282,10 @@ class StockMoveLine(models.Model):
                 picking.delivery_status = 'none'
 
     # Ambil uom dari stock move
-    # @api.model
-    # def create(self, vals):
-    #     if 'move_id' in vals and 'product_uom_id' not in vals:
-    #         move = self.env['stock.move'].browse(vals['move_id'])
-    #         if move.product_uom:
-    #             vals['product_uom_id'] = move.product_uom.id
-    #     return super().create(vals)
\ No newline at end of file
+    @api.model
+    def create(self, vals):
+        if 'move_id' in vals and 'product_uom_id' not in vals:
+            move = self.env['stock.move'].browse(vals['move_id'])
+            if move.product_uom:
+                vals['product_uom_id'] = move.product_uom.id
+        return super().create(vals)
\ No newline at end of file
-- 
cgit v1.2.3


From 4497a43c6a65921902e611f6787341a180cc29f3 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 11 Nov 2025 08:59:07 +0700
Subject: <Miqdad> aktivin code ambil uom dari SO

---
 indoteknik_custom/models/stock_move.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index ff87f911..cac88287 100644
--- a/indoteknik_custom/models/stock_move.py
+++ b/indoteknik_custom/models/stock_move.py
@@ -22,12 +22,12 @@ class StockMove(models.Model):
     partial = fields.Boolean('Partial?', default=False)
 
     # Ambil product uom dari SO line
-    # @api.model
-    # def create(self, vals):
-    #     if vals.get('sale_line_id'):
-    #         sale_line = self.env['sale.order.line'].browse(vals['sale_line_id'])
-    #         vals['product_uom'] = sale_line.product_uom.id
-    #     return super().create(vals)
+    @api.model
+    def create(self, vals):
+        if vals.get('sale_line_id'):
+            sale_line = self.env['sale.order.line'].browse(vals['sale_line_id'])
+            vals['product_uom'] = sale_line.product_uom.id
+        return super().create(vals)
 
     # @api.model_create_multi
     # def create(self, vals_list):
-- 
cgit v1.2.3


From ffe4551ea6eaf0fa97d1a72cbc56596b33825cee Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 11 Nov 2025 11:50:44 +0700
Subject: (andri) add log

---
 indoteknik_custom/models/sale_order.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 37f8b9cc..357d2395 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2395,6 +2395,7 @@ class SaleOrder(models.Model):
                 self.check_credit_limit()
                 self.check_limit_so_to_invoice()
                 order.approval_status = 'pengajuan1'
+                order.message_post(body="Mengajukan approval ke Team Sales")
                 return self._create_approval_notification('Team Sales')
             
             if not order.with_context(ask_approval=True)._is_request_to_own_team_leader():
@@ -2636,7 +2637,8 @@ class SaleOrder(models.Model):
                 order.approval_status = 'pengajuan1'
                 return self._create_approval_notification('Sales Manager')
             elif order._requires_approval_team_sales():
-                # order.approval_status = 'pengajuan1'
+                order.approval_status = 'pengajuan1'
+                order.message_post(body="Mengajukan approval ke Team Sales")
                 return self._create_approval_notification('Team Sales')
 
             order.approval_status = 'approved'
-- 
cgit v1.2.3


From f1a8e2740bf42524be6dde351c694edb28786aef Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 11 Nov 2025 14:17:43 +0700
Subject: (andri) fix ask approval

---
 indoteknik_custom/models/sale_order.py                 | 4 ++--
 indoteknik_custom/views/advance_payment_request.xml    | 2 +-
 indoteknik_custom/views/advance_payment_settlement.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 357d2395..7070717b 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2759,10 +2759,10 @@ class SaleOrder(models.Model):
         if user.is_leader or user.is_sales_manager:
             return True
 
-        if self.env.context.get("ask_approval") and user.id in (3401, 20, 3988):
+        if self.env.context.get("ask_approval") and user.id in (3401, 20, 3988, 17340):
             return True
         
-        if not self.env.context.get("ask_approval") and user.id in (3401, 20, 3988, 17340): # admin (fida, nabila, ninda)
+        if not self.env.context.get("ask_approval") and user.id in (3401, 20, 3988, 17340): # admin (fida, nabila, ninda, feby)
             raise UserError("Yahaha gabisa confirm so, minta ke sales nya ajah")
         
         
diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index f8217150..b498b8a8 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -4,7 +4,7 @@
         <field name="name">advance.payment.request.form</field>
         <field name="model">advance.payment.request</field>
         <field name="arch" type="xml">
-            <form string="Advance Payment Request &amp; Reimburse">
+            <form string="Advance Payment Request &amp; Reimburse" duplicate="0">
                 <header>
                     <button name="action_realisasi_pum"
                         type="object"
diff --git a/indoteknik_custom/views/advance_payment_settlement.xml b/indoteknik_custom/views/advance_payment_settlement.xml
index 188f09d0..050e3933 100644
--- a/indoteknik_custom/views/advance_payment_settlement.xml
+++ b/indoteknik_custom/views/advance_payment_settlement.xml
@@ -3,7 +3,7 @@
         <field name="name">advance.payment.settlement.form</field>
         <field name="model">advance.payment.settlement</field>
         <field name="arch" type="xml">
-            <form string="Advance Payment Settlement">
+            <form string="Advance Payment Settlement" duplicate="0">
                 <header>
                     <button name="action_cab"
                         type="object"
-- 
cgit v1.2.3


From b74b5bc94ed7a84ca2387fc0373f25b5eb27593d Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 11 Nov 2025 14:43:00 +0700
Subject: (andri) fix usererror

---
 indoteknik_custom/models/sale_order.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 7070717b..1d34374e 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2763,8 +2763,7 @@ class SaleOrder(models.Model):
             return True
         
         if not self.env.context.get("ask_approval") and user.id in (3401, 20, 3988, 17340): # admin (fida, nabila, ninda, feby)
-            raise UserError("Yahaha gabisa confirm so, minta ke sales nya ajah")
-        
+            raise UserError("Sales Admin tidak bisa confirm SO, silahkan hubungi Salesperson yang bersangkutan.")
         
         salesperson_id = self.user_id.id
         approver_id = user.id
-- 
cgit v1.2.3


From c1fec44860dae0d762959f1ab34617f6ef6e42cf Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 11 Nov 2025 15:38:54 +0700
Subject: (andri) fix ask approval for sales admin

---
 indoteknik_custom/models/sale_order.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 1d34374e..6b1057dd 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2404,6 +2404,13 @@ class SaleOrder(models.Model):
                     'Hanya bisa konfirmasi SO tim Anda.'
                 )
 
+            user = self.env.user
+            is_sales_admin = user.id in (3401, 20, 3988, 17340)
+            if is_sales_admin:
+                order.approval_status = 'pengajuan1'
+                order.message_post(body="Mengajukan approval ke Team Sales")
+                return self._create_approval_notification('Team Sales')
+            
             raise UserError("Bisa langsung Confirm")
 
     def send_notif_to_salesperson(self, cancel=False):
-- 
cgit v1.2.3


From 704f27afd94787260543a2b6fed2ecfa13e786cb Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 11 Nov 2025 16:01:14 +0700
Subject: <Miqdad> fix coretax xml

---
 indoteknik_custom/models/coretax_fatur.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/indoteknik_custom/models/coretax_fatur.py b/indoteknik_custom/models/coretax_fatur.py
index 7e0de919..cabcd5d6 100644
--- a/indoteknik_custom/models/coretax_fatur.py
+++ b/indoteknik_custom/models/coretax_fatur.py
@@ -148,8 +148,6 @@ class CoretaxFaktur(models.Model):
                 quantity = line_quantity
                 total_discount = round(line_discount, 2)
                 coretax_id = line.product_uom_id.coretax_id
-                uom_name = line.product_uom_id.name
-
                 # Calculate other tax values
                 otherTaxBase = round(subtotal * (11 / 12), 2) if subtotal else 0
                 vat_amount = round(otherTaxBase * 0.12, 2)
@@ -161,7 +159,7 @@ class CoretaxFaktur(models.Model):
                 ET.SubElement(good_service, 'Opt').text = 'A'
                 ET.SubElement(good_service, 'Code').text = '000000'
                 ET.SubElement(good_service, 'Name').text = line_name
-                ET.SubElement(good_service, uom_name).text = coretax_id
+                ET.SubElement(good_service, 'Unit').text = coretax_id
                 # ET.SubElement(good_service, 'Price').text = str(round(line_price_unit, 2)) if line_price_unit else '0'
                 ET.SubElement(good_service, 'Price').text = str(price_per_unit)
                 ET.SubElement(good_service, 'Qty').text = str(quantity)
-- 
cgit v1.2.3


From 5e82281428e5297841179b4b9940e64d7e506815 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 11 Nov 2025 18:32:53 +0700
Subject: <Miqdad> fix ir access

---
 indoteknik_custom/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index dadc2c82..caafc4aa 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -210,4 +210,4 @@ access_unpaid_invoice_view,access.unpaid.invoice.view,model_unpaid_invoice_view,
 access_surat_piutang_user,surat.piutang user,model_surat_piutang,,1,1,1,1
 access_surat_piutang_line_user,surat.piutang.line user,model_surat_piutang_line,,1,1,1,1
 access_sj_tele,access.sj.tele,model_sj_tele,base.group_system,1,1,1,1
-access_stock_picking_sj_document,stock.picking.sj.document,model_stock_picking_sj_document,base.group_system,1,1,1,1
+access_stock_picking_sj_document,stock.picking.sj.document,model_stock_picking_sj_document,1,1,1,1
-- 
cgit v1.2.3


From 9b983054e1aca39139e47f717c425090659ed3e3 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 11 Nov 2025 18:36:15 +0700
Subject: <Miqdad> fix ir access

---
 indoteknik_custom/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index caafc4aa..0529db82 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -210,4 +210,4 @@ access_unpaid_invoice_view,access.unpaid.invoice.view,model_unpaid_invoice_view,
 access_surat_piutang_user,surat.piutang user,model_surat_piutang,,1,1,1,1
 access_surat_piutang_line_user,surat.piutang.line user,model_surat_piutang_line,,1,1,1,1
 access_sj_tele,access.sj.tele,model_sj_tele,base.group_system,1,1,1,1
-access_stock_picking_sj_document,stock.picking.sj.document,model_stock_picking_sj_document,1,1,1,1
+access_stock_picking_sj_document,stock.picking.sj.document,model_stock_picking_sj_document,base.group_user,1,1,1,1
-- 
cgit v1.2.3


From 4274751a04b7fc02b38a0af4683f06ae4f5508ad Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Wed, 12 Nov 2025 08:41:10 +0700
Subject: fix notify

---
 indoteknik_custom/models/sale_order.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 6b1057dd..861089d5 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2395,8 +2395,8 @@ class SaleOrder(models.Model):
                 self.check_credit_limit()
                 self.check_limit_so_to_invoice()
                 order.approval_status = 'pengajuan1'
-                order.message_post(body="Mengajukan approval ke Team Sales")
-                return self._create_approval_notification('Team Sales')
+                order.message_post(body="Mengajukan approval ke Sales")
+                return self._create_approval_notification('Sales')
             
             if not order.with_context(ask_approval=True)._is_request_to_own_team_leader():
                 return self._create_notification_action(
-- 
cgit v1.2.3


From 1086aadae846f8334cdb0292c606fb5a4d186f89 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Wed, 12 Nov 2025 08:42:34 +0700
Subject: fix

---
 indoteknik_custom/models/sale_order.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 861089d5..2de4109d 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2395,8 +2395,8 @@ class SaleOrder(models.Model):
                 self.check_credit_limit()
                 self.check_limit_so_to_invoice()
                 order.approval_status = 'pengajuan1'
-                order.message_post(body="Mengajukan approval ke Sales")
-                return self._create_approval_notification('Sales')
+                order.message_post(body="Mengajukan approval ke Team Sales")
+                return self._create_approval_notification('Team Sales')
             
             if not order.with_context(ask_approval=True)._is_request_to_own_team_leader():
                 return self._create_notification_action(
@@ -2408,8 +2408,8 @@ class SaleOrder(models.Model):
             is_sales_admin = user.id in (3401, 20, 3988, 17340)
             if is_sales_admin:
                 order.approval_status = 'pengajuan1'
-                order.message_post(body="Mengajukan approval ke Team Sales")
-                return self._create_approval_notification('Team Sales')
+                order.message_post(body="Mengajukan approval ke Sales")
+                return self._create_approval_notification('Sales')
             
             raise UserError("Bisa langsung Confirm")
 
-- 
cgit v1.2.3


From 583a8e3064790a06063d5dc1b06ed8122bb22e4e Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Wed, 12 Nov 2025 08:44:27 +0700
Subject: (andri) fix

---
 indoteknik_custom/models/sale_order.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 2de4109d..8e731307 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2383,12 +2383,14 @@ class SaleOrder(models.Model):
             
             if order._requires_approval_margin_leader():
                 order.approval_status = 'pengajuan2'
+                order.message_post(body="Mengajukan approval ke Pimpinan")
                 return self._create_approval_notification('Pimpinan')
             elif order._requires_approval_margin_manager():
                 self.check_product_bom()
                 self.check_credit_limit()
                 self.check_limit_so_to_invoice()
                 order.approval_status = 'pengajuan1'
+                order.message_post(body="Mengajukan approval ke Sales Manager")
                 return self._create_approval_notification('Sales Manager')
             elif order._requires_approval_team_sales():
                 self.check_product_bom()
-- 
cgit v1.2.3


From 563e63fa97fa5734601f95ab3c9961c11f1e33fe Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 12 Nov 2025 10:12:28 +0700
Subject: <Miqdad> merge

---
 indoteknik_custom/views/sale_order.xml    |  8 ++++++--
 indoteknik_custom/views/stock_picking.xml | 29 +++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index b2ecc21c..3e424788 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -55,6 +55,10 @@
                         attrs="{'invisible':['|', ('partner_is_cbd_locked','=',False), ('state', 'not in', ['draft', 'cancel'])]}">
                         <strong>Warning!</strong> Payment Terms Customer terkunci menjadi <b>Cash Before Delivery (C.B.D.)</b> karena ada invoice telah jatuh tempo <b>30 hari</b>. Silakan ajukan <b>Approval Payment Term</b> untuk membuka kunci.
                     </div>
+                    <widget name="web_ribbon"
+                        title="FIKTIF"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('is_so_fiktif', '=', False)]}"/>
                 </xpath>
                 <div class="oe_button_box" name="button_box">
                     <field name="advance_payment_move_ids" invisible="1"/>
@@ -499,8 +503,8 @@
                     <field name="date_kirim_ril"/>
                     <field name="date_driver_departure"/>
                     <field name="date_driver_arrival"/>
-                    <field name="payment_state_custom" widget="badge" 
-                    decoration-danger="payment_state_custom == 'unpaid'" 
+                    <field name="payment_state_custom" widget="badge"
+                    decoration-danger="payment_state_custom == 'unpaid'"
                     decoration-success="payment_state_custom == 'paid'"
                     decoration-warning="payment_state_custom == 'partial'" optional="hide"/>
                     <field name="unreserved_percent" widget="percentpie" string="Unreserved" optional="hide"/>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 4779c5d3..84eafbaf 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -115,6 +115,7 @@
                        position="after">
                     <field name="product_image" widget="image"
                            style="height:128px;width:128px;" readonly="1"/>
+
                 </xpath> -->
                 <field name="backorder_id" position="after">
                     <field name="select_shipping_option_so"/>
@@ -162,11 +163,12 @@
 
                 <field name="origin" position="after">
                     <!--                    <field name="show_state_approve_md" invisible="1" optional="hide"/>-->
-                    <field name="state_approve_md" widget="badge" attrs="{'invisible': [('picking_type_id', 'in', [29,30])]}"/>
+                    <field name="state_approve_md" widget="badge"
+                           attrs="{'invisible': [('picking_type_id', 'in', [29,30])]}"/>
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
                     <field name="invoice_status"/>
-                    <field name="is_bu_iu" />
+                    <field name="is_bu_iu"/>
                     <field name="is_so_fiktif" readonly="1"/>
                     <field name="approval_status" attrs="{'invisible': [('is_bu_iu', '=', False)]}"/>
                     <field name="date_doc_kirim" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
@@ -341,6 +343,22 @@
             </field>
         </record>
 
+        <record id="view_picking_form_inherit_ribbon" model="ir.ui.view">
+            <field name="name">stock.picking.form.ribbon</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="arch" type="xml">
+                <!-- Sisipkan sebelum elemen dengan class oe_title -->
+                <xpath expr="//sheet/div[@class='oe_title']" position="before">
+                    <widget name="web_ribbon"
+                            title="FIKTIF"
+                            bg_color="bg-danger"
+                            attrs="{'invisible': [('is_so_fiktif', '=', False)]}"/>
+                </xpath>
+            </field>
+        </record>
+
+
         <record id="scan_koli_tree" model="ir.ui.view">
             <field name="name">scan.koli.tree</field>
             <field name="model">scan.koli</field>
@@ -413,7 +431,8 @@
                     <field name="qty_yang_mau_dikirim"/>
                     <field name="qty_terkirim"/>
                     <field name="qty_gantung"/>
-                    <field name="delivery_status" widget="badge" options="{'colors': {'full': 'success', 'partial': 'warning', 'partial_final': 'danger'}}"/>
+                    <field name="delivery_status" widget="badge"
+                           options="{'colors': {'full': 'success', 'partial': 'warning', 'partial_final': 'danger'}}"/>
                 </tree>
             </field>
         </record>
@@ -437,7 +456,9 @@
                 <form string="Peringatan Koli Belum Diperiksa">
                     <sheet>
                         <div class="oe_title">
-                            <h2><span>⚠️ Perhatian!</span></h2>
+                            <h2>
+                                <span>⚠️ Perhatian!</span>
+                            </h2>
                         </div>
                         <group>
                             <field name="message" readonly="1" nolabel="1" widget="text"/>
-- 
cgit v1.2.3


From 9c9a50bfc6e29a27b153caa734d1035ed654958e Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Wed, 12 Nov 2025 14:50:36 +0700
Subject: (andri) update view tree PUM reimburse

---
 indoteknik_custom/views/advance_payment_request.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index b498b8a8..1f244540 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -214,11 +214,26 @@
         </field>
     </record>
 
+    <record id="view_advance_payment_request_filter" model="ir.ui.view">
+        <field name="name">advance.payment.request.filter</field>
+        <field name="model">advance.payment.request</field>
+        <field name="arch" type="xml">
+            <search string="Search APR &amp; Reimburse">
+                <filter string="My Requests" name="my_requests" domain="[('user_id','=',uid)]"/>
+                <separator/>
+                <filter string="PUM" name="filter_pum" domain="[('type_request','=','pum')]"/>
+                <filter string="Reimburse" name="filter_reimburse" domain="[('type_request','=','reimburse')]"/>
+            </search>
+        </field>
+    </record>
+
     <record id="action_advance_payment_request" model="ir.actions.act_window">
         <field name="name">Pengajuan Uang Muka &amp; Reimburse</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">advance.payment.request</field>
         <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_my_requests': 1}</field>
+        <field name="search_view_id" ref="view_advance_payment_request_filter"/> 
     </record>
 
     <menuitem id="menu_advance_payment_request_acct"
-- 
cgit v1.2.3


From 82d571fba45fde775ac53cc73dfee54bebd61488 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Wed, 12 Nov 2025 14:53:29 +0700
Subject: (andri) fix

---
 indoteknik_custom/views/advance_payment_request.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 1f244540..4e73bb28 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -219,7 +219,7 @@
         <field name="model">advance.payment.request</field>
         <field name="arch" type="xml">
             <search string="Search APR &amp; Reimburse">
-                <filter string="My Requests" name="my_requests" domain="[('user_id','=',uid)]"/>
+                <filter string="My Requests" name="my_requests" domain="[('applicant_name','=',uid)]"/>
                 <separator/>
                 <filter string="PUM" name="filter_pum" domain="[('type_request','=','pum')]"/>
                 <filter string="Reimburse" name="filter_reimburse" domain="[('type_request','=','reimburse')]"/>
-- 
cgit v1.2.3


From 7049765e3fa5ffca23725d652134ab3662912762 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 12 Nov 2025 23:57:23 +0700
Subject: <miqdad> add tracking so fiktif

---
 indoteknik_custom/models/sale_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 8e731307..14b66d87 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -398,7 +398,7 @@ class SaleOrder(models.Model):
         compute="_compute_partner_is_cbd_locked"
     )
     internal_notes_contact = fields.Text(related='partner_id.comment', string="Internal Notes", readonly=True, help="Internal Notes dari contact utama customer.")
-    is_so_fiktif = fields.Boolean('SO Fiktif?')
+    is_so_fiktif = fields.Boolean('SO Fiktif?', tracking=3)
 
     def action_set_shipping_id(self):
         for rec in self:
-- 
cgit v1.2.3


From e1c3a9b0ab65a698eeb64b7ab17dd82558c273fa Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 12 Nov 2025 23:58:03 +0700
Subject: <miqdad> add tracking so fiktif

---
 indoteknik_custom/models/stock_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 49001974..7c4cea8b 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -200,7 +200,7 @@ class StockPicking(models.Model):
         ('full', 'Full'),
     ], string='Delivery Status', compute='_compute_delivery_status_detail', store=False)
     so_num = fields.Char('SO Number', compute='_get_so_num')
-    is_so_fiktif = fields.Boolean('SO Fiktif?', compute='_compute_is_so_fiktif')
+    is_so_fiktif = fields.Boolean('SO Fiktif?', compute='_compute_is_so_fiktif', tracking=3)
 
     @api.depends('sale_id.is_so_fiktif')
     def _compute_is_so_fiktif(self):
-- 
cgit v1.2.3


From 097117408600ce6fb95ebc3c095d521fead94bea Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 13 Nov 2025 00:03:38 +0700
Subject: <miqdad> show so fiktif in tree view

---
 indoteknik_custom/views/sale_order.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index b2ecc21c..3e2af82f 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -483,6 +483,7 @@
                     <field name="pareto_status" optional="hide"/>
                     <field name="shipping_method_picking" optional="hide"/>
                     <field name="hold_outgoing" optional="hide"/>
+                    <field name="is_so_fiktif" optional="show"/>
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3


From fad550a10bbbca3058d598878ff8e9a5366335a6 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 13 Nov 2025 00:07:50 +0700
Subject: <miqdad> show so fiktif in tree view

---
 indoteknik_custom/views/sale_order.xml    | 2 +-
 indoteknik_custom/views/stock_picking.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 3e2af82f..29a5281e 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -483,7 +483,7 @@
                     <field name="pareto_status" optional="hide"/>
                     <field name="shipping_method_picking" optional="hide"/>
                     <field name="hold_outgoing" optional="hide"/>
-                    <field name="is_so_fiktif" optional="show"/>
+                    <field name="is_so_fiktif" optional="hide" readonly="1"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 4779c5d3..c13bba2b 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -23,6 +23,7 @@
                     <field name="state_packing" widget="badge" decoration-success="state_packing == 'packing_done'"
                            decoration-danger="state_packing == 'not_packing'" optional="hide"/>
                     <field name="final_seq"/>
+                    <field name="is_so_fiktif" optional="hide" readonly="1"/>
                     <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'"
                            decoration-warning="state_approve_md == 'pending'" optional="hide"/>
                     <!-- <field name="countdown_hours" optional="hide"/>
-- 
cgit v1.2.3


From 39c95b7097f188350d71414c72f6abe7a711cf18 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 13 Nov 2025 15:12:09 +0700
Subject: (andri) fix sync janji bayar

---
 indoteknik_custom/models/account_move.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index 684ef335..c460a332 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -161,7 +161,8 @@ class AccountMove(models.Model):
     def action_sync_promise_date(self):
         self.ensure_one()
         finance_user_ids = [688] 
-        if self.env.user.id not in finance_user_ids:
+        is_it = self.env.user.has_group('indoteknik_custom.group_role_it')
+        if self.env.user.id not in finance_user_ids and not is_it:
             raise UserError('Hanya Finance (Widya) yang dapat menggunakan fitur ini.')
         if not self.customer_promise_date:
             raise UserError("Isi Janji Bayar terlebih dahulu sebelum melakukan sinkronisasi.")
@@ -169,10 +170,11 @@ class AccountMove(models.Model):
         other_invoices = self.env['account.move'].search([
             ('id', '!=', self.id),
             ('partner_id', '=', self.partner_id.id),
-            ('invoice_date_due', '=', self.invoice_date_due),
+            ('payment_state', 'not in', ['paid', 'in_payment', 'reversed']),
             ('move_type', '=', 'out_invoice'),
             ('state', '=', 'posted'),
-            ('date_terima_tukar_faktur', '!=', False)
+            ('date_terima_tukar_faktur', '!=', False),
+            ('invoice_payment_term_id.name', 'ilike', 'tempo')
         ])
         lines = []
         for inv in other_invoices:
-- 
cgit v1.2.3


From 37469d36fe1d03f3c497e8aba34bc6d81fff033f Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Thu, 13 Nov 2025 16:29:35 +0700
Subject: checkpoint calculate commission internal using helper

---
 indoteknik_custom/models/commission_internal.py | 233 ++++++++++++++++++++++++
 indoteknik_custom/security/ir.model.access.csv  |   1 +
 indoteknik_custom/views/commission_internal.xml |  55 ++++++
 3 files changed, 289 insertions(+)

diff --git a/indoteknik_custom/models/commission_internal.py b/indoteknik_custom/models/commission_internal.py
index 8a333bda..ce074bcc 100644
--- a/indoteknik_custom/models/commission_internal.py
+++ b/indoteknik_custom/models/commission_internal.py
@@ -26,6 +26,8 @@ class CommissionInternal(models.Model):
     comment = fields.Char(string='Comment')
     commission_internal_line = fields.One2many('commission.internal.line', 'commission_internal_id', string='Lines',
                                                auto_join=True, order='account_move_id asc')
+    commission_internal_result = fields.One2many('commission.internal.result', 'commission_internal_id', string='Result',
+                                               auto_join=True, order='account_move_id asc')
 
     @api.model
     def create(self, vals):
@@ -67,6 +69,194 @@ class CommissionInternal(models.Model):
 
         return dt_start, dt_end
 
+    # CREDIT > 0
+    def _calculate_exclude_credit(self):
+        query = [
+            ('commission_internal_id.id', '=', self.id),
+            ('credit', '>', 0),
+            ('status', '=', False)
+        ]
+        lines = self.env['commission.internal.line'].search(query)
+        for line in lines:
+            line.helper1 = 'CREDIT'
+
+    # INV/20
+    def _calculate_keyword_invoice(self):
+        query = [
+            ('commission_internal_id.id', '=', self.id),
+            ('helper1', '=', False),
+            ('label', 'ilike', '%INV/20%'),
+        ]
+        lines = self.env['commission.internal.line'].search(query)
+        # parse label and set helper
+        for line in lines:
+            line.helper1 = 'INV/20'
+
+    # ONGKOS KIRIM SO/20
+    def _calculate_keyword_deliveryamt(self):
+        query = [
+            ('commission_internal_id.id', '=', self.id),
+            ('helper1', '=', False),
+            ('label', 'ilike', '%ONGKOS KIRIM SO/20%'),
+        ]
+        lines = self.env['commission.internal.line'].search(query)
+        for line in lines:
+            line.helper1 = 'ONGKOS KIRIM SO/20'
+
+    # Payment SO/20
+    def _calculate_keyword_payment(self):
+        query = [
+            ('commission_internal_id.id', '=', self.id),
+            ('helper1', '=', False),
+            ('label', 'ilike', '%Payment SO/20%'),
+        ]
+        lines = self.env['commission.internal.line'].search(query)
+        for line in lines:
+            line.helper1 = 'Payment SO/20'
+
+    # UANG MUKA PENJUALAN SO/20
+    def _calculate_keyword_dp(self):
+        query = [
+            ('commission_internal_id.id', '=', self.id),
+            ('helper1', '=', False),
+            ('label', 'ilike', '%UANG MUKA PENJUALAN SO/20%'),
+        ]
+        lines = self.env['commission.internal.line'].search(query)
+        for line in lines:
+            line.helper1 = 'UANG MUKA PENJUALAN SO/20'
+
+    def _calculate_keyword_undefined(self):
+        query = [
+            ('commission_internal_id.id', '=', self.id),
+            ('helper1', '=', False),
+        ]
+        lines = self.env['commission.internal.line'].search(query)
+        for line in lines:
+            line.helper1 = 'UNDEFINED'
+
+    def _parse_label_helper2(self):
+        exception = ['CREDIT', 'UNDEFINED']
+        query = [
+            ('commission_internal_id.id', '=', self.id),
+            ('helper1', 'not in', exception)
+        ]
+        lines = self.env['commission.internal.line'].search(query)
+        for line in lines:
+            clean_label = line.label.replace('-', ' ').replace(',', ' ')
+            list_label = clean_label.split()
+            list_helper2 = []
+            for key in list_label:
+                clean_key = key.replace(',', '') # delete commas for make sure
+                if clean_key[:6] == 'INV/20':
+                    list_helper2.append(clean_key)
+                elif clean_key[:5] == 'SO/20':
+                    list_invoice = self._switch_so_to_inv(clean_key)
+                    str_invoice = ' '.join(list_invoice)
+                    list_helper2.append(str_invoice)
+            result_helper2 = ' '.join(list_helper2)
+            line.helper2 = result_helper2
+
+    def _switch_so_to_inv(self, order):
+        list_state = ['sale', 'done']
+        result = []
+        query = [
+            ('state', 'in', list_state),
+            ('name', '=', order)
+        ]
+        sales = self.env['sale.order'].search(query)
+        if sales:
+            for sale in sales:
+                if sale.invoice_ids:
+                    for invoice in sale.invoice_ids:
+                        if invoice.state == 'posted':
+                            result.append(invoice.name)
+                else:
+                    result.append(order)
+        else:
+            result.append(order)
+        return result
+
+    # fill later TODO @stephan
+    def calculate_commission_internal_result(self):
+        query = [
+            ('commission_internal_id.id', '=', self.id),
+            ('helper2', '!=', False)
+        ]
+        lines = self.env['commission.internal.line'].search(query)
+        for line in lines:
+            list_so = list_invoice = []
+            list_key = line.helper2.split()
+            for key in list_key:
+                if key[:6] == 'INV/20':
+                    list_invoice.append(key)
+                if key[:5] == 'SO/20':
+                    list_so.append(key)
+            invoices = self.env['account.move'].search([('state', '=', 'posted'), ('name', 'in', list_invoice)])
+            orders = self.env['sale.order'].search([('state', 'in', ['done', 'sale']), ('name', 'in', list_so)])
+            invoice_data = invoices.mapped(lambda r: {
+                'res_name': 'account.move',
+                'res_id': r.id,
+                'name': r.name,
+                'date': r.invoice_date,
+                'customer': r.partner_id.name,
+                'salesperson': r.user_id.name,
+                'amount_untaxed': r.amount_untaxed,
+                'amount_tax': r.amount_tax,
+                'amount_total': r.amount_total
+            })
+            sale_data = orders.mapped(lambda r: {
+                'res_name': 'sale.order',
+                'res_id': r.id,
+                'name': r.name,
+                'date': r.date_order,
+                'customer': r.partner_id.name,
+                'salesperson': r.user_id.name,
+                'amount_untaxed': r.amount_untaxed,
+                'amount_tax': r.amount_tax,
+                'amount_total': r.grand_total
+            })
+            invoices_and_sales = invoice_data + sale_data
+            total_amount = sum(item.get('amount_total', 0.0) for item in invoices_and_sales)
+            for data in invoices_and_sales:
+                prorate = data.get('amount_total', 0.0) / total_amount
+                # net_amount_prorate = data.get('amount_total', 0.0) * prorate
+                net_amount_prorate = line.balance * prorate
+                self.env['commission.internal.result'].create([{
+                    'commission_internal_id': line.commission_internal_id.id,
+                    'commission_internal_line_id': line.id,
+                    'date_doc': data['date'],
+                    'number': data['name'],
+                    'res_name': data['res_name'],
+                    'res_id': data['res_id'],
+                    'name': data['name'],
+                    'salesperson': data['salesperson'],
+                    'totalamt': data['amount_total'],
+                    'uang_masuk_line_id': line.account_move_line_id.id,
+                    'uang_masuk_id': line.account_move_id.id,
+                    'date_uang_masuk': line.date,
+                    'label_uang_masuk': line.label,
+                    'nomor_uang_masuk': line.number,
+                    'uang_masuk': line.balance,
+                    'linenetamt_prorate': net_amount_prorate,
+                    'helper1': line.helper1
+                }])
+                print(1)
+        print(1)
+
+    # this button / method works for train data in July 2025
+    def calculate_commission_internal_from_keyword(self):
+        if not self.commission_internal_line:
+            raise UserError('Commission Internal Line kosong, click Copy GL terlebih dahulu')
+        # execute helper1 for mark keyword
+        self._calculate_exclude_credit()
+        self._calculate_keyword_invoice()
+        self._calculate_keyword_deliveryamt()
+        self._calculate_keyword_payment()
+        self._calculate_keyword_dp()
+        self._calculate_keyword_undefined()
+        # execute helper2 for parse the label into INV/ or SO/ and switch SO to INV if available
+        self._parse_label_helper2()
+
     def generate_commission_from_generate_ledger(self):
         if self.commission_internal_line:
             raise UserError('Harus hapus semua line jika ingin generate ulang')
@@ -127,3 +317,46 @@ class CommissionInternalLine(models.Model):
     linenetamt = fields.Float(string='Net Amount')
     dpp = fields.Float(string='DPP')
     status = fields.Char(string='Status')
+    salespersons = fields.Char(string='Salespersons')
+    invoices = fields.Char(string='Invoices')
+    helper1 = fields.Char(string='Helper1')
+    helper2 = fields.Char(string='Helper2')
+    helper3 = fields.Char(string='Helper3')
+    helper4 = fields.Char(string='Helper4')
+    helper5 = fields.Char(string='Helper5')
+
+
+class CommissionInternalResult(models.Model):
+    _name = 'commission.internal.result'
+    _description = 'Result'
+    _order = 'number asc, id'
+
+    commission_internal_id = fields.Many2one('commission.internal', string='Internal Ref', required=True,
+                                             ondelete='cascade', index=True, copy=False)
+    commission_internal_line_id = fields.Many2one('commission.internal.line', string='Line Ref')
+    res_name = fields.Char(string='Res Name')
+    res_id = fields.Integer(string='Res ID')
+    date_doc = fields.Date(string='Date Doc')
+    number = fields.Char(string='Number')
+    name = fields.Char(string='Name')
+    salesperson = fields.Char(string='Salesperson')
+    totalamt = fields.Float(string='Total Amount')
+    uang_masuk_line_id = fields.Many2one('account.move.line', string='Uang Masuk Line ID')
+    uang_masuk_id = fields.Many2one('account.move', string='Uang Masuk ID')
+    date_uang_masuk = fields.Date(string='Date Uang Masuk')
+    label_uang_masuk = fields.Char(string='Label Uang Masuk')
+    nomor_uang_masuk = fields.Char(string='Nomor Uang Masuk')
+    uang_masuk = fields.Float(string='Uang Masuk')
+    ongkir = fields.Float(string='Ongkir')
+    refund = fields.Float(string='Refund')
+    pph = fields.Float(string='PPh23')
+    others = fields.Float(string='Others')
+    linenetamt = fields.Float(string='Net Amount')
+    linenetamt_prorate = fields.Float(string='Net Amount Prorate')
+    dpp = fields.Float(string='DPP')
+    status = fields.Char(string='Status')
+    helper1 = fields.Char(string='Helper1')
+    helper2 = fields.Char(string='Helper2')
+    helper3 = fields.Char(string='Helper3')
+    helper4 = fields.Char(string='Helper4')
+    helper5 = fields.Char(string='Helper5')
diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index 1a799d01..616d996c 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -166,6 +166,7 @@ access_stock_backorder_confirmation,access.stock.backorder.confirmation,model_st
 access_warning_modal_wizard,access.warning.modal.wizard,model_warning_modal_wizard,,1,1,1,1
 access_commission_internal,access.commission.internal,model_commission_internal,,1,1,1,1
 access_commission_internal_line,access.commission.internal.line,model_commission_internal_line,,1,1,1,1
+access_commission_internal_result,access.commission.internal.result,model_commission_internal_result,,1,1,1,1
 
 access_User_pengajuan_tempo_line,access.user.pengajuan.tempo.line,model_user_pengajuan_tempo_line,,1,1,1,1
 access_user_pengajuan_tempo,access.user.pengajuan.tempo,model_user_pengajuan_tempo,,1,1,1,1
diff --git a/indoteknik_custom/views/commission_internal.xml b/indoteknik_custom/views/commission_internal.xml
index 1489a83b..2f3db5b0 100644
--- a/indoteknik_custom/views/commission_internal.xml
+++ b/indoteknik_custom/views/commission_internal.xml
@@ -38,12 +38,27 @@
                                     type="object"
                                 />
                                 </div>
+                                <div>
+                                <button name="calculate_commission_internal_from_keyword"
+                                    string="Calculate"
+                                    type="object"
+                                />
+                                </div>
+                                <div>
+                                <button name="calculate_commission_internal_result"
+                                    string="Result"
+                                    type="object"
+                                />
+                                </div>
                             </group>
                         </group>
                         <notebook>
                             <page id="commission_internal_line_tab" string="Lines">
                                 <field name="commission_internal_line"/>
                             </page>
+                            <page id="commission_internal_result_tab" string="Result">
+                                <field name="commission_internal_result"/>
+                            </page>
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
@@ -74,6 +89,46 @@
                 <field name="linenetamt"/>
                 <field name="dpp"/>
                 <field name="status"/>
+                <field name="helper1" optional="hide"/>
+                <field name="helper2" optional="hide"/>
+                <field name="helper3" optional="hide"/>
+                <field name="helper4" optional="hide"/>
+                <field name="helper5" optional="hide"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="commission_internal_result_tree" model="ir.ui.view">
+        <field name="name">commission.internal.result.tree</field>
+        <field name="model">commission.internal.result</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="date_doc"/>
+                <field name="number"/>
+                <field name="res_name" optional="hide"/>
+                <field name="res_id" optional="hide"/>
+                <field name="name"/>
+                <field name="salesperson"/>
+                <field name="totalamt"/>
+                <field name="uang_masuk_line_id" optional="hide"/>
+                <field name="uang_masuk_id" optional="hide"/>
+                <field name="date_uang_masuk"/>
+                <field name="label_uang_masuk"/>
+                <field name="nomor_uang_masuk"/>
+                <field name="uang_masuk"/>
+                <field name="ongkir"/>
+                <field name="refund"/>
+                <field name="pph"/>
+                <field name="others"/>
+                <field name="linenetamt"/>
+                <field name="linenetamt_prorate"/>
+                <field name="dpp"/>
+                <field name="status" optional="hide"/>
+                <field name="helper1" optional="hide"/>
+                <field name="helper2" optional="hide"/>
+                <field name="helper3" optional="hide"/>
+                <field name="helper4" optional="hide"/>
+                <field name="helper5" optional="hide"/>
             </tree>
         </field>
     </record>
-- 
cgit v1.2.3


From ae89c43f6efa66ac7e332e62ce6cc6817f75c16d Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 13 Nov 2025 17:06:48 +0700
Subject: (andri) add invoice payment widget di tree inv, unlock COA reimburse,
 and add tracking edit pricelist contact

---
 indoteknik_custom/models/account_move.py           | 27 +++++++++++++++++++++-
 .../models/advance_payment_request.py              |  3 +--
 indoteknik_custom/models/res_partner.py            |  3 +++
 indoteknik_custom/views/account_move.xml           |  2 ++
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index c460a332..12e8ecba 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -3,7 +3,7 @@ from odoo.exceptions import AccessError, UserError, ValidationError
 from markupsafe import escape as html_escape
 from datetime import timedelta, date, datetime
 from pytz import timezone, utc
-import logging
+import logging, json
 import base64
 import PyPDF2
 import os
@@ -108,6 +108,31 @@ class AccountMove(models.Model):
     )
     internal_notes_contact = fields.Text(related='partner_id.comment', string="Internal Notes", readonly=True, help="Internal Notes dari contact utama customer.")
 
+    payment_info = fields.Text(
+        string="Payment Info",
+        compute='_compute_payment_info',
+        store=False,
+        help="Informasi pembayaran yang diambil dari payment yang sudah direkonsiliasi ke invoice ini."
+    )
+
+    def _compute_payment_info(self):
+        for rec in self:
+            summary = ""
+            try:
+                widget_data = rec.invoice_payments_widget
+                if widget_data:
+                    data = json.loads(widget_data)
+                    lines = []
+                    for item in data.get('content', []):
+                        amount = item.get('amount', 0.0)
+                        date = item.get('date') or item.get('payment_date') or ''
+                        formatted_amount = formatLang(self.env, amount, currency_obj=rec.currency_id)
+                        lines.append(f"<i>Paid on {date}</i> - {formatted_amount}")
+                    summary = "\n".join(lines) if lines else (data.get('title', '') or "")
+            except Exception:
+                summary = ""
+            rec.payment_info = summary
+
     # def _check_and_lock_cbd(self):
     #     cbd_term = self.env['account.payment.term'].browse(26)
     #     today = date.today()
diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index 6ea1c160..42097923 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -909,8 +909,7 @@ class ReimburseLine(models.Model):
     date = fields.Date(string='Tanggal', required=True, default=fields.Date.today)
     account_id = fields.Many2one(
         'account.account', 
-        string='Jenis Biaya',  tracking=3,
-        domain="[('id', 'in', [484, 486, 527, 529, 530, 471, 473, 492, 493, 488, 625, 528, 533, 534])]"
+        string='Jenis Biaya', tracking=3
     )
     description = fields.Text(string='Description', required=True, tracking=3)
     distance_departure = fields.Float(string='Pergi (Km)', tracking=3)
diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index f80bbcb6..7f4feb75 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -200,6 +200,9 @@ class ResPartner(models.Model):
         string='Previous Payment Term'
     )
 
+    property_product_pricelist = fields.Many2one(
+        tracking=True
+    )
 
     @api.depends("street", "street2", "city", "state_id", "country_id", "blok", "nomor", "rt", "rw", "kelurahan_id",
                  "kecamatan_id")
diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 9df03674..c5f9580c 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -140,6 +140,8 @@
                     <field name="shipper_faktur_id" optional="hide"/>
                     <field name="resi_tukar_faktur" optional="hide"/>
                     <field name="date_terima_tukar_faktur" optional="hide"/>
+                    <field name="payment_info" optional="hide" widget="html"/>
+                    <field name="customer_promise_date" optional="hide"/>
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3


From 83ceea85773615bf3f031554fa2ef9a2bc7c7760 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Fri, 14 Nov 2025 14:01:33 +0700
Subject: (andri) fix printout penutupan tempo

---
 indoteknik_custom/models/account_move.py        |  5 +-
 indoteknik_custom/report/report_tutup_tempo.xml | 69 ++++++++++++++++++++++---
 2 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index 12e8ecba..5e38b544 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -32,7 +32,6 @@ class AccountMove(models.Model):
     new_due_date = fields.Date(string='New Due')
     counter = fields.Integer(string="Counter", default=0)
     cost_centre_id = fields.Many2one('cost.centre', string='Cost Centre')
-    analytic_account_ids = fields.Many2many('account.analytic.account', string='Analytic Account')
     due_line = fields.One2many('due.extension.line', 'invoice_id', compute='_compute_due_line', string='Due Extension Lines')
     no_faktur_pajak = fields.Char(string='No Faktur Pajak')
     date_completed = fields.Datetime(string='Date Completed')
@@ -127,8 +126,8 @@ class AccountMove(models.Model):
                         amount = item.get('amount', 0.0)
                         date = item.get('date') or item.get('payment_date') or ''
                         formatted_amount = formatLang(self.env, amount, currency_obj=rec.currency_id)
-                        lines.append(f"<i>Paid on {date}</i> - {formatted_amount}")
-                    summary = "\n".join(lines) if lines else (data.get('title', '') or "")
+                        lines.append(f"<li><i>Paid on {date}</i> - {formatted_amount}</li>")
+                    summary = f"<ul>{''.join(lines)}</ul>" if lines else (data.get('title', '') or "")
             except Exception:
                 summary = ""
             rec.payment_info = summary
diff --git a/indoteknik_custom/report/report_tutup_tempo.xml b/indoteknik_custom/report/report_tutup_tempo.xml
index 1aa1367d..5fa5552f 100644
--- a/indoteknik_custom/report/report_tutup_tempo.xml
+++ b/indoteknik_custom/report/report_tutup_tempo.xml
@@ -91,19 +91,72 @@
                             Berdasarkan catatan kami, pembayaran atas beberapa invoice yang telah melewati batas waktu 30 (tiga puluh) hari adalah sebagai berikut:
                         </p>
                         
-                        <table class="table table-sm" style="font-size:13px; border:1px solid #000; margin-top:16px; margin-bottom:16px;">
+                        <table class="table table-sm o_main_table"
+                            style="font-size:13px; border:1px solid #000; border-collapse: collapse; width:100%; table-layout: fixed;">
+
                             <thead style="background:#f5f5f5;">
                                 <tr>
-                                    <th style="border:1px solid #000; padding:4px; font-weight: bold;">Invoice</th>
-                                    <th style="border:1px solid #000; padding:4px; font-weight: bold;">Due Date</th>
-                                    <th style="border:1px solid #000; padding:4px; font-weight: bold;" class="text-center">Day to Due</th>
+                                    <th style="border:1px solid #000; padding:4px; width:5%; font-weight: bold;" class="text-center">No.</th>
+                                    <th style="border:1px solid #000; padding:4px; width:16%; font-weight: bold;">Invoice Number</th>
+                                    <th style="border:1px solid #000; padding:4px; width:10%; font-weight: bold;">Invoice Date</th>
+                                    <th style="border:1px solid #000; padding:4px; width:10%; font-weight: bold;">Due Date</th>
+                                    <th style="border:1px solid #000; padding:4px; width:6%; font-weight: bold;" class="text-center">Day to Due</th>
+                                    <th style="border:1px solid #000; padding:4px; width:16%; font-weight: bold;">Reference</th>
+                                    <th style="border:1px solid #000; padding:4px; width:17%; font-weight: bold;" class="text-right">Amount Due</th>
+                                    <th style="border:1px solid #000; padding:4px; width:11%; font-weight: bold;">Payment Terms</th>
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr t-foreach="selected_lines" t-as="line">
-                                    <td style="border:1px solid #000; padding:4px;"><t t-esc="line.invoice_number"/></td>
-                                    <td style="border:1px solid #000; padding:4px;"><t t-esc="line.invoice_date_due and line.invoice_date_due.strftime('%d-%m-%Y')"/></td>
-                                    <td style="border:1px solid #000; padding:4px;" class="text-center"><t t-esc="line.new_invoice_day_to_due"/></td>
+                                <tr t-foreach="doc.line_ids.filtered(lambda l: l.selected)" t-as="line">
+                                    
+                                    <!-- Nomor Urut -->
+                                    <td style="border:1px solid #000; padding:4px; text-align:center;">
+                                        <t t-esc="line.sort or '-'"/>
+                                    </td>
+
+                                    <!-- Invoice Number -->
+                                    <td style="border:1px solid #000; padding:4px; word-wrap: break-word;">
+                                        <t t-esc="line.invoice_number or '-'"/>
+                                    </td>
+
+                                    <!-- Invoice Date -->
+                                    <td style="border:1px solid #000; padding:4px;">
+                                        <t t-esc="line.invoice_date and line.invoice_date.strftime('%d-%m-%Y') or '-'"/>
+                                    </td>
+
+                                    <!-- Due Date -->
+                                    <td style="border:1px solid #000; padding:4px;">
+                                        <t t-esc="line.invoice_date_due and line.invoice_date_due.strftime('%d-%m-%Y') or '-'"/>
+                                    </td>
+
+                                    <!-- Day to Due -->
+                                    <td style="border:1px solid #000; padding:4px; text-align:center;">
+                                        <t t-esc="line.new_invoice_day_to_due or '-'"/>
+                                    </td>
+
+                                    <!-- Reference -->
+                                    <td style="border:1px solid #000; padding:4px; word-wrap: break-word;">
+                                        <t t-esc="line.ref or '-'"/>
+                                    </td>
+
+                                    <!-- Amount Due -->
+                                    <td style="border:1px solid #000; padding:4px; text-align:right;">
+                                        Rp. <t t-esc="'{:,.0f}'.format(line.amount_residual).replace(',', '.')"/>
+                                    </td>
+
+                                    <!-- Payment Terms -->
+                                    <td style="border:1px solid #000; padding:4px; word-wrap: break-word;">
+                                        <t t-esc="line.payment_term_id.name or '-'"/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td colspan="5" class="text-left" style="border:1px solid #000; padding:4px; word-wrap: break-word; white-space: normal; font-weight: bold;">
+                                        GRAND TOTAL INVOICE YANG BELUM DIBAYAR DAN TELAH JATUH TEMPO
+                                    </td>
+                                    <td colspan="3" class="text-right" style="border:1px solid #000; padding:4px; word-wrap: break-word; white-space: normal; font-weight: bold;">
+                                        Rp. <t t-esc="'{:,.0f}'.format(doc.grand_total).replace(',', '.')"/>  
+                                        (<t t-esc="doc.grand_total_text or '-'"/>)
+                                    </td>
                                 </tr>
                             </tbody>
                         </table>
-- 
cgit v1.2.3


From 6fe8ab222556bf623ee916e0d92cd5557e9b04d5 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Fri, 14 Nov 2025 14:39:40 +0700
Subject: testing commission internal

---
 indoteknik_custom/models/commission_internal.py | 84 ++++++++++++++++---------
 1 file changed, 56 insertions(+), 28 deletions(-)

diff --git a/indoteknik_custom/models/commission_internal.py b/indoteknik_custom/models/commission_internal.py
index ce074bcc..bc668c28 100644
--- a/indoteknik_custom/models/commission_internal.py
+++ b/indoteknik_custom/models/commission_internal.py
@@ -2,6 +2,7 @@ from odoo import models, api, fields
 from odoo.exceptions import AccessError, UserError, ValidationError
 from datetime import timedelta, date
 import logging
+import pandas as pd
 
 _logger = logging.getLogger(__name__)
 
@@ -178,11 +179,14 @@ class CommissionInternal(models.Model):
 
     # fill later TODO @stephan
     def calculate_commission_internal_result(self):
+        exception = ['ONGKOS KIRIM SO/20']
         query = [
             ('commission_internal_id.id', '=', self.id),
-            ('helper2', '!=', False)
+            ('helper2', '!=', False),
+            ('helper1', 'not in', exception)
         ]
         lines = self.env['commission.internal.line'].search(query)
+        all_invoices_and_sales = []
         for line in lines:
             list_so = list_invoice = []
             list_key = line.helper2.split()
@@ -202,7 +206,17 @@ class CommissionInternal(models.Model):
                 'salesperson': r.user_id.name,
                 'amount_untaxed': r.amount_untaxed,
                 'amount_tax': r.amount_tax,
-                'amount_total': r.amount_total
+                'amount_total': r.amount_total,
+                'uang_masuk_line_id': line.account_move_line_id.id,
+                'uang_masuk_id': line.account_move_id.id,
+                'date_uang_masuk': line.date,
+                'label_uang_masuk': line.label,
+                'nomor_uang_masuk': line.number,
+                'uang_masuk': line.balance,
+                # 'linenetamt_prorate': net_amount_prorate,
+                'helper1': line.helper1,
+                'commission_internal_id': line.commission_internal_id.id,
+                'commission_internal_line_id': line.id,
             })
             sale_data = orders.mapped(lambda r: {
                 'res_name': 'sale.order',
@@ -213,34 +227,48 @@ class CommissionInternal(models.Model):
                 'salesperson': r.user_id.name,
                 'amount_untaxed': r.amount_untaxed,
                 'amount_tax': r.amount_tax,
-                'amount_total': r.grand_total
+                'amount_total': r.grand_total,
+                'uang_masuk_line_id': line.account_move_line_id.id,
+                'uang_masuk_id': line.account_move_id.id,
+                'date_uang_masuk': line.date,
+                'label_uang_masuk': line.label,
+                'nomor_uang_masuk': line.number,
+                'uang_masuk': line.balance,
+                # 'linenetamt_prorate': net_amount_prorate,
+                'helper1': line.helper1,
+                'commission_internal_id': line.commission_internal_id.id,
+                'commission_internal_line_id': line.id,
             })
             invoices_and_sales = invoice_data + sale_data
-            total_amount = sum(item.get('amount_total', 0.0) for item in invoices_and_sales)
-            for data in invoices_and_sales:
-                prorate = data.get('amount_total', 0.0) / total_amount
-                # net_amount_prorate = data.get('amount_total', 0.0) * prorate
-                net_amount_prorate = line.balance * prorate
-                self.env['commission.internal.result'].create([{
-                    'commission_internal_id': line.commission_internal_id.id,
-                    'commission_internal_line_id': line.id,
-                    'date_doc': data['date'],
-                    'number': data['name'],
-                    'res_name': data['res_name'],
-                    'res_id': data['res_id'],
-                    'name': data['name'],
-                    'salesperson': data['salesperson'],
-                    'totalamt': data['amount_total'],
-                    'uang_masuk_line_id': line.account_move_line_id.id,
-                    'uang_masuk_id': line.account_move_id.id,
-                    'date_uang_masuk': line.date,
-                    'label_uang_masuk': line.label,
-                    'nomor_uang_masuk': line.number,
-                    'uang_masuk': line.balance,
-                    'linenetamt_prorate': net_amount_prorate,
-                    'helper1': line.helper1
-                }])
-                print(1)
+            sum_amount_total = sum(item['amount_total'] for item in invoices_and_sales)
+            for item in invoices_and_sales:
+                item['sum_amount_total'] = sum_amount_total
+            all_invoices_and_sales.extend(invoices_and_sales)
+
+        for data in all_invoices_and_sales:
+            # total_amount = sum(item.get('amount_total', 0.0) for item in invoices_and_sales)
+            # net_amount_prorate = data.get('amount_total', 0.0) * prorate
+            prorate = data.get('amount_total', 0.0) / data.get('sum_amount_total', 0.0)
+            net_amount_prorate = data.get('uang_masuk', 0.0) * prorate
+            self.env['commission.internal.result'].create([{
+                'commission_internal_id': data['commission_internal_id'],
+                'commission_internal_line_id': data['commission_internal_line_id'],
+                'date_doc': data['date'],
+                'number': data['name'],
+                'res_name': data['res_name'],
+                'res_id': data['res_id'],
+                'name': data['name'],
+                'salesperson': data['salesperson'],
+                'totalamt': data['amount_total'],
+                'uang_masuk_line_id': data['uang_masuk_line_id'],
+                'uang_masuk_id': data['uang_masuk_id'],
+                'date_uang_masuk': data['date_uang_masuk'],
+                'label_uang_masuk': data['label_uang_masuk'],
+                'nomor_uang_masuk': data['nomor_uang_masuk'],
+                'uang_masuk': data['uang_masuk'],
+                'linenetamt_prorate': net_amount_prorate,
+                'helper1': data['helper1']
+            }])
         print(1)
 
     # this button / method works for train data in July 2025
-- 
cgit v1.2.3


From 5322376db0faea9de44243f2d747e68eb1713d75 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 14 Nov 2025 14:49:48 +0700
Subject: <Miqdad> remove pandas

---
 indoteknik_custom/models/commission_internal.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indoteknik_custom/models/commission_internal.py b/indoteknik_custom/models/commission_internal.py
index bc668c28..66d32706 100644
--- a/indoteknik_custom/models/commission_internal.py
+++ b/indoteknik_custom/models/commission_internal.py
@@ -2,7 +2,6 @@ from odoo import models, api, fields
 from odoo.exceptions import AccessError, UserError, ValidationError
 from datetime import timedelta, date
 import logging
-import pandas as pd
 
 _logger = logging.getLogger(__name__)
 
-- 
cgit v1.2.3


From 93f431a8d96bb46cb34ad9629d450b34a531265c Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 14 Nov 2025 15:22:48 +0700
Subject: <Miqdad> fix ccm X

---
 indoteknik_custom/models/tukar_guling.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/indoteknik_custom/models/tukar_guling.py b/indoteknik_custom/models/tukar_guling.py
index 99a74505..c8375161 100644
--- a/indoteknik_custom/models/tukar_guling.py
+++ b/indoteknik_custom/models/tukar_guling.py
@@ -737,14 +737,12 @@ class TukarGuling(models.Model):
             if mapping_koli and record.operations.picking_type_id.id == 29:
                 for prod in mapping_koli.mapped('product_id'):
                     qty_total = sum(mk.qty_return for mk in mapping_koli.filtered(lambda m: m.product_id == prod))
-                    move = bu_out.move_lines.filtered(lambda m: m.product_id == prod)
-                    if not move:
-                        raise UserError(f"Move BU/OUT tidak ditemukan untuk produk {prod.display_name}")
-                    srt_return_lines.append((0, 0, {
-                        'product_id': prod.id,
-                        'quantity': qty_total,
-                        'move_id': move.id,
-                    }))
+                    for ml in bu_out.move_line_ids.filtered(lambda ml: ml.qty_done > 0 and not ml.package_id):
+                        srt_return_lines.append((0, 0, {
+                            'product_id': ml.product_id.id,
+                            'quantity': ml.qty_done,
+                            'move_id': ml.move_id.id,
+                        }))
                     _logger.info(f"📟 SRT line: {prod.display_name} | qty={qty_total}")
 
             elif not mapping_koli and record.operations.picking_type_id.id == 29:
-- 
cgit v1.2.3


From f1bf6c4cfa31446a15e5678a80c023cadba64f86 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 14 Nov 2025 16:19:19 +0700
Subject: <Miqdad> fix ccm

---
 indoteknik_custom/models/tukar_guling.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/tukar_guling.py b/indoteknik_custom/models/tukar_guling.py
index c8375161..aa116ce3 100644
--- a/indoteknik_custom/models/tukar_guling.py
+++ b/indoteknik_custom/models/tukar_guling.py
@@ -737,12 +737,18 @@ class TukarGuling(models.Model):
             if mapping_koli and record.operations.picking_type_id.id == 29:
                 for prod in mapping_koli.mapped('product_id'):
                     qty_total = sum(mk.qty_return for mk in mapping_koli.filtered(lambda m: m.product_id == prod))
-                    for ml in bu_out.move_line_ids.filtered(lambda ml: ml.qty_done > 0 and not ml.package_id):
+
+                    move_lines = bu_out.move_line_ids.filtered(
+                        lambda ml: ml.product_id == prod and ml.qty_done > 0 and not ml.package_id
+                    )
+
+                    for ml in move_lines:
                         srt_return_lines.append((0, 0, {
                             'product_id': ml.product_id.id,
                             'quantity': ml.qty_done,
                             'move_id': ml.move_id.id,
                         }))
+
                     _logger.info(f"📟 SRT line: {prod.display_name} | qty={qty_total}")
 
             elif not mapping_koli and record.operations.picking_type_id.id == 29:
-- 
cgit v1.2.3


From 6b253ed4dc5346ee8f5cefed035ab8a2d02e90ac Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 14 Nov 2025 17:01:38 +0700
Subject: <Miqdad> BD iu approval fix

---
 indoteknik_custom/models/stock_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 7c4cea8b..f69e5fa9 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1603,7 +1603,7 @@ class StockPicking(models.Model):
             self.tukar_guling_po_id.update_doc_state()
 
         user = self.env.user
-        if not user.has_group('indoteknik_custom.group_role_logistic'):
+        if not user.has_group('indoteknik_custom.group_role_logistic') and 'BU/IU' in self.name:
             raise UserWarning('Validate hnaya bisa di lakukan oleh logistik')
 
         return res
-- 
cgit v1.2.3


From db87e7d19b369b7f0181f9ffc774cce5adc76091 Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Mon, 17 Nov 2025 10:37:04 +0700
Subject: push

---
 indoteknik_custom/models/refund_sale_order.py | 40 ++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index 9eae5b32..bbab3ec4 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -326,8 +326,23 @@ class RefundSaleOrder(models.Model):
                         domain.append(('ref', 'ilike', n))
                 moves2 = self.env['account.move'].search(domain)
 
+            moves3 = self.env['account.move']
+            if so_ids:
+                so_names = self.env['sale.order'].browse(so_ids).mapped('name')
+                domain = [
+                    ('journal_id', '=', 11),
+                    ('state', '=', 'posted'),
+                    ('ref', 'ilike', 'uang muka penjualan')
+                ]
+                if so_names:
+                    domain += ['|'] * (len(so_names) - 1)
+                    for n in so_names:
+                        domain.append(('ref', 'ilike', n))
+                moves3 = self.env['account.move'].search(domain)
+
             has_moves = bool(moves)
             has_moves2 = bool(moves2)
+            has_moves3 = bool(moves3)
             has_piutangmdr = bool(piutangmdr)
             has_piutangbca = bool(piutangbca)
             has_misc = bool(misc)
@@ -349,6 +364,8 @@ class RefundSaleOrder(models.Model):
             # sisanya bisa dijumlahkan tanpa konflik
             if has_moves2:
                 amounts.append(sum(moves2.mapped('amount_total_signed')))
+            if has_moves3:
+                amounts.append(sum(moves3.mapped('amount_total_signed')))
             if has_piutangbca:
                 amounts.append(sum(piutangbca.mapped('amount_total_signed')))
             if has_piutangmdr:
@@ -573,9 +590,10 @@ class RefundSaleOrder(models.Model):
                 domain = [
                     ('journal_id', '=', 11),
                     ('state', '=', 'posted'),
-                    '|',
+                    '|', '|',
                     ('ref', 'ilike', 'dp'),
                     ('ref', 'ilike', 'payment'),
+                    ('ref', 'ilike', 'uang muka penjualan'),
                 ]
                 domain += ['|'] * (len(so_names) - 1)
                 for n in so_names:
@@ -653,6 +671,7 @@ class RefundSaleOrder(models.Model):
                 ('journal_id', '=', 13),
                 ('state', '=', 'posted'),
             ])
+
         moves2 = self.env['account.move']
         if so_ids:
             so_records = self.env['sale.order'].browse(so_ids)
@@ -668,9 +687,26 @@ class RefundSaleOrder(models.Model):
                 domain.append(('ref', 'ilike', n))
 
             moves2 = self.env['account.move'].search(domain)
+
+        moves3 = self.env['account.move']
+        if so_ids:
+            so_records = self.env['sale.order'].browse(so_ids)
+            so_names = so_records.mapped('name')     
+
+            domain = [
+                ('journal_id', '=', 11),
+                ('state', '=', 'posted'),
+                ('ref', 'ilike', 'uang muka penjualan')
+            ]
+            domain += ['|'] * (len(so_names) - 1)
+            for n in so_names:
+                domain.append(('ref', 'ilike', n))
+
+            moves3 = self.env['account.move'].search(domain)
             
         has_moves = bool(moves)
         has_moves2 = bool(moves2)
+        has_moves3 = bool(moves3)
         has_piutangmdr = bool(piutangmdr)
         has_piutangbca = bool(piutangbca)
         has_misc = bool(misc)
@@ -685,6 +721,8 @@ class RefundSaleOrder(models.Model):
             amounts.append(sum(moves.mapped('amount_total_signed')))
         if has_moves2:
             amounts.append(sum(moves2.mapped('amount_total_signed')))
+        if has_moves3:
+            amounts.append(sum(moves3.mapped('amount_total_signed')))
         if has_piutangbca:
             amounts.append(sum(piutangbca.mapped('amount_total_signed')))
         if has_piutangmdr:
-- 
cgit v1.2.3


From bdaad593bd6b3853f98cfc8d203c49474bbb69ac Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Mon, 17 Nov 2025 10:49:48 +0700
Subject: push

---
 indoteknik_custom/models/refund_sale_order.py | 66 +++++++++++++--------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index bbab3ec4..c6db2174 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -750,39 +750,39 @@ class RefundSaleOrder(models.Model):
         if self.sale_order_ids:
             self.partner_id = self.sale_order_ids[0].partner_id
 
-    @api.constrains('sale_order_ids')
-    def _check_sale_orders_payment(self):
-        """ Validasi SO harus punya uang masuk (Journal Uang Muka / Midtrans) """
-        for rec in self:
-            invalid_orders = []
-
-            for so in rec.sale_order_ids:
-                # cari journal uang muka
-                moves = self.env['account.move'].search([
-                    ('sale_id', '=', so.id),
-                    ('journal_id', '=', 11),   # Journal Uang Muka
-                    ('state', '=', 'posted'),
-                ])
-                piutangbca = self.env['account.move'].search([
-                    ('ref', 'in', rec.invoice_ids.mapped('name')),
-                    ('journal_id', '=', 4),
-                    ('state', '=', 'posted'),
-                ])
-                piutangmdr = self.env['account.move'].search([
-                    ('ref', 'in', rec.invoice_ids.mapped('name')),
-                    ('journal_id', '=', 7),
-                    ('state', '=', 'posted'),
-                ])
-
-                if not moves and so.payment_status != 'settlement' and not piutangbca and not piutangmdr:
-                    invalid_orders.append(so.name)
-
-            if invalid_orders:
-                raise ValidationError(
-                    f"Tidak dapat membuat refund untuk SO {', '.join(invalid_orders)} "
-                    "karena tidak memiliki Record Uang Masuk (Journal Uang Muka/Payment Invoice/Midtrans).\n"
-                    "Pastikan semua SO yang dipilih sudah memiliki Record pembayaran yang valid."
-                )
+    # @api.constrains('sale_order_ids')
+    # def _check_sale_orders_payment(self):
+    #     """ Validasi SO harus punya uang masuk (Journal Uang Muka / Midtrans) """
+    #     for rec in self:
+    #         invalid_orders = []
+
+    #         for so in rec.sale_order_ids:
+    #             # cari journal uang muka
+    #             moves = self.env['account.move'].search([
+    #                 ('sale_id', '=', so.id),
+    #                 ('journal_id', '=', 11),   # Journal Uang Muka
+    #                 ('state', '=', 'posted'),
+    #             ])
+    #             piutangbca = self.env['account.move'].search([
+    #                 ('ref', 'in', rec.invoice_ids.mapped('name')),
+    #                 ('journal_id', '=', 4),
+    #                 ('state', '=', 'posted'),
+    #             ])
+    #             piutangmdr = self.env['account.move'].search([
+    #                 ('ref', 'in', rec.invoice_ids.mapped('name')),
+    #                 ('journal_id', '=', 7),
+    #                 ('state', '=', 'posted'),
+    #             ])
+
+    #             if not moves and so.payment_status != 'settlement' and not piutangbca and not piutangmdr:
+    #                 invalid_orders.append(so.name)
+
+    #         if invalid_orders:
+    #             raise ValidationError(
+    #                 f"Tidak dapat membuat refund untuk SO {', '.join(invalid_orders)} "
+    #                 "karena tidak memiliki Record Uang Masuk (Journal Uang Muka/Payment Invoice/Midtrans).\n"
+    #                 "Pastikan semua SO yang dipilih sudah memiliki Record pembayaran yang valid."
+    #             )
 
     @api.onchange('refund_type')
     def _onchange_refund_type(self):
-- 
cgit v1.2.3


From 6f254e896a0a788ac7f3a8c1668be5f31f70b640 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 17 Nov 2025 12:02:35 +0700
Subject: (andri) add field infomation line pada dunning run + fix approve due
 extension log

---
 indoteknik_custom/models/account_move_due_extension.py | 5 +++++
 indoteknik_custom/models/dunning_run.py                | 1 +
 indoteknik_custom/views/dunning_run.xml                | 1 +
 3 files changed, 7 insertions(+)

diff --git a/indoteknik_custom/models/account_move_due_extension.py b/indoteknik_custom/models/account_move_due_extension.py
index 55fc6c65..951d9745 100644
--- a/indoteknik_custom/models/account_move_due_extension.py
+++ b/indoteknik_custom/models/account_move_due_extension.py
@@ -115,6 +115,11 @@ class DueExtension(models.Model):
             self.order_id.check_credit_limit()
             self.order_id.approval_status = 'pengajuan1'
             return self.order_id._create_approval_notification('Sales Manager')
+
+        if self.order_id._requires_approval_team_sales():
+            self.order_id.check_credit_limit()
+            self.order_id.approval_status = 'pengajuan1'
+            return self.order_id._create_approval_notification('Team Sales')
         
         sales = self.env['sale.order'].browse(self.order_id.id)
         
diff --git a/indoteknik_custom/models/dunning_run.py b/indoteknik_custom/models/dunning_run.py
index 9feea1d1..2562c305 100644
--- a/indoteknik_custom/models/dunning_run.py
+++ b/indoteknik_custom/models/dunning_run.py
@@ -150,4 +150,5 @@ class DunningRunLine(models.Model):
     open_amt = fields.Float(string='Open Amount')
     due_date = fields.Date(string='Due Date')
     payment_term = fields.Many2one('account.payment.term', related='invoice_id.invoice_payment_term_id', string='Payment Term')
+    information_line = fields.Text(string='Information')
 
diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index 51377f78..911a372d 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -25,6 +25,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="partner_id"/>
+                <field name="information_line"/>
                 <field name="reference"/>
                 <field name="invoice_id"/>
                 <field name="date_invoice"/>
-- 
cgit v1.2.3


From 0e026757427842dc865a5cbf17f2e3d85a30875c Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 17 Nov 2025 17:10:38 +0700
Subject: <Miqdad> prevent schedule action

---
 indoteknik_custom/models/account_move.py   | 16 ++++++++++++++++
 indoteknik_custom/models/purchase_order.py | 10 ++++++++++
 indoteknik_custom/models/sj_tele.py        | 10 ++++++++++
 3 files changed, 36 insertions(+)

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index 5e38b544..6212664e 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -11,6 +11,7 @@ import re
 from terbilang import Terbilang
 from collections import defaultdict
 from odoo.tools.misc import formatLang
+import socket
 
 _logger = logging.getLogger(__name__)
 
@@ -218,7 +219,16 @@ class AccountMove(models.Model):
             'target': 'new',
         }
 
+    @staticmethod
+    def is_local_env():
+        hostname = socket.gethostname().lower()
+        keywords = ['andri', 'miqdad', 'fin', 'stephan', 'hafid', 'nathan']
+        return any(keyword in hostname for keyword in keywords)
+
     def send_due_invoice_reminder(self):
+        if self.is_local_env():
+            _logger.warning("📪 Local environment detected — skip sending email reminders.")
+            return
         today = fields.Date.today()
         target_dates = [
             today + timedelta(days=7),
@@ -240,6 +250,9 @@ class AccountMove(models.Model):
         self._send_invoice_reminders(invoices, mode='due')
 
     def send_overdue_invoice_reminder(self):
+        if self.is_local_env():
+            _logger.warning("📪 Local environment detected — skip sending email reminders.")
+            return
         today = fields.Date.today()
         invoices = self.env['account.move'].search([
             ('move_type', '=', 'out_invoice'),
@@ -255,6 +268,9 @@ class AccountMove(models.Model):
         self._send_invoice_reminders(invoices, mode='overdue')
 
     def _send_invoice_reminders(self, invoices, mode):
+        if self.is_local_env():
+            _logger.warning("📪 Local environment detected — skip sending email reminders.")
+            return
         today = fields.Date.today()
         template = self.env.ref('indoteknik_custom.mail_template_invoice_due_reminder')
 
diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 4475e777..3312e7fd 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -7,6 +7,8 @@ from pytz import timezone, utc
 import io
 import base64
 from odoo.tools import lazy_property
+import socket
+
 try:
     from odoo.tools.misc import xlsxwriter
 except ImportError:
@@ -121,6 +123,11 @@ class PurchaseOrder(models.Model):
         default=True
     )
 
+    @staticmethod
+    def is_local_env():
+        hostname = socket.gethostname().lower()
+        keywords = ['andri', 'miqdad', 'fin', 'stephan', 'hafid', 'nathan']
+        return any(keyword in hostname for keyword in keywords)
 
     @api.onchange('show_description')
     def onchange_show_description(self):
@@ -1140,6 +1147,9 @@ class PurchaseOrder(models.Model):
                 break 
 
         if send_email:
+            if self.is_local_env():
+                _logger.warning("📪 Local environment detected — skip sending email reminders.")
+                return
             self._send_mail()
 
         if self.revisi_po:
diff --git a/indoteknik_custom/models/sj_tele.py b/indoteknik_custom/models/sj_tele.py
index 53ba26fc..ed363f59 100644
--- a/indoteknik_custom/models/sj_tele.py
+++ b/indoteknik_custom/models/sj_tele.py
@@ -5,6 +5,7 @@ import json
 import logging, subprocess
 import time
 from collections import OrderedDict
+import socket
 
 _logger = logging.getLogger(__name__)
 
@@ -20,7 +21,16 @@ class SjTele(models.Model):
     date_doc_kirim = fields.Datetime(string='Tanggal Kirim SJ')
     is_sent = fields.Boolean(default=False)
 
+    @staticmethod
+    def is_local_env():
+        hostname = socket.gethostname().lower()
+        keywords = ['andri', 'miqdad', 'fin', 'stephan', 'hafid', 'nathan']
+        return any(keyword in hostname for keyword in keywords)
+
     def woi(self):
+        if self.is_local_env():
+            _logger.warning("📪 Local environment detected — skip sending email reminders.")
+            return
         bot_mqdd = '8203414501:AAHy_XwiUAVrgRM2EJzW7sZx9npRLITZpb8'
         chat_id_mqdd = '-1003087280519'
         api_base = f'https://api.telegram.org/bot{bot_mqdd}'
-- 
cgit v1.2.3


From 6074d548889ea0bcd489fcc6642eeaec1422cf89 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Tue, 18 Nov 2025 08:00:33 +0700
Subject: fix commission internal sales

---
 indoteknik_custom/models/commission_internal.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/models/commission_internal.py b/indoteknik_custom/models/commission_internal.py
index 66d32706..cd6da380 100644
--- a/indoteknik_custom/models/commission_internal.py
+++ b/indoteknik_custom/models/commission_internal.py
@@ -194,8 +194,8 @@ class CommissionInternal(models.Model):
                     list_invoice.append(key)
                 if key[:5] == 'SO/20':
                     list_so.append(key)
-            invoices = self.env['account.move'].search([('state', '=', 'posted'), ('name', 'in', list_invoice)])
-            orders = self.env['sale.order'].search([('state', 'in', ['done', 'sale']), ('name', 'in', list_so)])
+            invoices = self.env['account.move'].search([('name', 'in', list_invoice)])
+            orders = self.env['sale.order'].search([('name', 'in', list_so)])
             invoice_data = invoices.mapped(lambda r: {
                 'res_name': 'account.move',
                 'res_id': r.id,
@@ -216,6 +216,7 @@ class CommissionInternal(models.Model):
                 'helper1': line.helper1,
                 'commission_internal_id': line.commission_internal_id.id,
                 'commission_internal_line_id': line.id,
+                'helper2': r.state,
             })
             sale_data = orders.mapped(lambda r: {
                 'res_name': 'sale.order',
@@ -237,6 +238,7 @@ class CommissionInternal(models.Model):
                 'helper1': line.helper1,
                 'commission_internal_id': line.commission_internal_id.id,
                 'commission_internal_line_id': line.id,
+                'helper2': r.state,
             })
             invoices_and_sales = invoice_data + sale_data
             sum_amount_total = sum(item['amount_total'] for item in invoices_and_sales)
@@ -266,7 +268,8 @@ class CommissionInternal(models.Model):
                 'nomor_uang_masuk': data['nomor_uang_masuk'],
                 'uang_masuk': data['uang_masuk'],
                 'linenetamt_prorate': net_amount_prorate,
-                'helper1': data['helper1']
+                'helper1': data['helper1'],
+                'helper2': data['helper2']
             }])
         print(1)
 
-- 
cgit v1.2.3


From 696a0ef4e25abd39a013503694be11ca2b0645ca Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 18 Nov 2025 10:14:25 +0700
Subject: (andri) add id transit CNY & HO

---
 indoteknik_custom/models/advance_payment_request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index 42097923..d96fc8ee 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -1421,7 +1421,7 @@ class AdvancePaymentCreateBill(models.TransientModel):
     apr_id = fields.Many2one('advance.payment.request', string='Advance Payment Request', required=True)
     account_id = fields.Many2one(
         'account.account', string='Bank Intransit', required=True,
-        domain="[('id', 'in', [573, 389, 392])]" # ID Bank Intransit
+        domain="[('id', 'in', [573, 389, 392, 683, 380])]" # ID Bank Intransit
     )
     nominal = fields.Float(string='Nominal', related='apr_id.nominal')
 
-- 
cgit v1.2.3


From ecdcf707992e0816a22619e7b87156eab8c9ed0c Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 18 Nov 2025 10:49:19 +0700
Subject: (andri) fix bug confirm payment PUM

---
 indoteknik_custom/models/advance_payment_request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index d96fc8ee..ec23de63 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -505,7 +505,7 @@ class AdvancePaymentRequest(models.Model):
         for rec in self:
             if not rec.attachment_file_image and not rec.attachment_file_pdf:
                 raise UserError(
-                    f'Tidak bisa konfirmasi pembayaran PUM {rec.name or ""} '
+                    f'Tidak bisa konfirmasi pembayaran {rec.number or ""} '
                     f'karena belum ada bukti attachment (PDF/Image).'
                 )
 
-- 
cgit v1.2.3


From 61a1d7e817de31b52285b6bf6448c321f1beac08 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 18 Nov 2025 11:34:19 +0700
Subject: <Miqdad> tracking & readonly sales team

---
 indoteknik_custom/models/sale_order.py | 5 ++++-
 indoteknik_custom/views/sale_order.xml | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 14b66d87..2ed4046f 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -398,7 +398,10 @@ class SaleOrder(models.Model):
         compute="_compute_partner_is_cbd_locked"
     )
     internal_notes_contact = fields.Text(related='partner_id.comment', string="Internal Notes", readonly=True, help="Internal Notes dari contact utama customer.")
-    is_so_fiktif = fields.Boolean('SO Fiktif?', tracking=3)
+    is_so_fiktif = fields.Boolean('SO Fiktif?', tracking=3)    
+    team_id = fields.Many2one(tracking=True)
+
+
 
     def action_set_shipping_id(self):
         for rec in self:
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 9495c7ce..23fbe155 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -147,6 +147,10 @@
                     <field name="helper_by_id" readonly="1" />
                     <field name="compute_fullfillment" invisible="1" />
                 </field>
+                <xpath expr="//field[@name='team_id']" position="attributes">
+                    <attribute name="attrs">{'readonly': [('state', 'in', ['sale', 'done'])]}</attribute>
+                </xpath>
+
                 <field name="tag_ids" position="after">
                     <!-- <field name="eta_date_start"/> -->
                     <t t-esc="' to '"/>
-- 
cgit v1.2.3


From b3e037e6d9f67e63803f6e56929f7c10b61074a3 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 18 Nov 2025 15:36:05 +0700
Subject: (andri) fix linked STJ PO

---
 indoteknik_custom/models/stock_picking.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index f69e5fa9..e7686b75 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1541,9 +1541,9 @@ class StockPicking(models.Model):
             self.check_koli()
         res = super(StockPicking, self).button_validate()
 
-        # Penambahan link PO di Stock Journal untuk Picking BD
+        # Penambahan link PO di Stock Journal
         for picking in self:
-            if picking.name and 'BD/' in picking.name and picking.purchase_id:
+            if picking.name and picking.purchase_id:
                 stock_journal = self.env['account.move'].search([
                     ('ref', 'ilike', picking.name + '%'),
                     ('journal_id', '=', 3)  # Stock Journal ID
-- 
cgit v1.2.3


From e22ed5070117edbd7757ce409cb779da7fdc5c12 Mon Sep 17 00:00:00 2001
From: Mqdd <ahmadmiqdad27@gmail.com>
Date: Wed, 19 Nov 2025 09:37:44 +0700
Subject: <Miqdad> conditional hide so num

---
 indoteknik_custom/views/stock_picking.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index f3abb11e..bad85963 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -184,7 +184,7 @@
                            'required': [['is_internal_use', '=', True]]
                            }"
                     />
-                    <field name="so_num"/>
+                    <field name="so_num" attrs="{'invisible': [('picking_type_id', 'not in', [29,30,73,74])]}"/>
                 </field>
                 <field name="group_id" position="before">
                     <field name="date_reserved"/>
-- 
cgit v1.2.3