From 7965212570e382b1fe94a96cfe16f3d2babb1d27 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 22 Sep 2025 09:53:47 +0700
Subject: (andri) init button

---
 indoteknik_custom/models/approval_payment_term.py | 4 ++++
 indoteknik_custom/views/approval_payment_term.xml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/indoteknik_custom/models/approval_payment_term.py b/indoteknik_custom/models/approval_payment_term.py
index 449bd90b..fbdabe7f 100644
--- a/indoteknik_custom/models/approval_payment_term.py
+++ b/indoteknik_custom/models/approval_payment_term.py
@@ -56,6 +56,10 @@ class ApprovalPaymentTerm(models.Model):
 
     change_log_688 = fields.Text(string="Change Log", readonly=True, copy=False)
 
+    def button_closing_mail(self):
+
+        return 
+
     def write(self, vals):
         # Ambil nilai lama sebelum perubahan
         old_values_dict = {
diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index b0b99689..090c9b5c 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -32,6 +32,10 @@
         <field name="arch" type="xml">
             <form>
                 <header>
+                <!-- <button name="button_closing_mail"
+                    string="Send Closing by Email"
+                    type="object"
+                /> -->
                     <button name="button_approve"
                     string="Approve"
                     type="object"
-- 
cgit v1.2.3


From 8b179c22149366ecf4dd9de6e5e7b5be612e355b Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 22 Sep 2025 10:15:45 +0700
Subject: (andri) add template

---
 indoteknik_custom/__manifest__.py                  |  3 +-
 .../views/mail_template_closing_apt.xml            | 32 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 indoteknik_custom/views/mail_template_closing_apt.xml

diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py
index cf7cf1e4..90fa915f 100755
--- a/indoteknik_custom/__manifest__.py
+++ b/indoteknik_custom/__manifest__.py
@@ -183,7 +183,8 @@
         'views/letter_receivable.xml',
         'views/letter_receivable_mail_template.xml',
         # 'views/reimburse.xml',
-        'views/sj_tele.xml'
+        'views/sj_tele.xml',
+        'views/mail_template_closing_apt.xml',
     ],
     'demo': [],
     'css': [],
diff --git a/indoteknik_custom/views/mail_template_closing_apt.xml b/indoteknik_custom/views/mail_template_closing_apt.xml
new file mode 100644
index 00000000..5df2813b
--- /dev/null
+++ b/indoteknik_custom/views/mail_template_closing_apt.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <data noupdate="0">
+    <record id="mail_template_closing_apt" model="mail.template">
+      <field name="name"></field>
+      <field name="model_id" ref="indoteknik_custom.model_approval_payment_term"/>
+      <field name="subject"></field>
+      <field name="email_from">finance@indoteknik.co.id</field>
+      <field name="email_to"></field>
+      <field name="body_html" type="html">
+        <div style="font-family:Arial, sans-serif; font-size:13px; color:#333;">
+          <p>
+            <b>
+              Best Regards,<br/><br/>
+              Widya R.<br/>
+              Dept. Finance<br/>
+              PT. INDOTEKNIK DOTCOM GEMILANG<br/>
+              <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" 
+                   alt="Indoteknik" style="max-width:18%; height:auto;"/><br/>
+              <a href="https://wa.me/6285716970374" target="_blank">+62-857-1697-0374</a> | 
+              <a href="mailto:finance@indoteknik.co.id">finance@indoteknik.co.id</a>
+            </b>
+          </p>
+          <!-- <p style="font-size:11px; color:#777;">
+            <i>Email ini dikirim secara otomatis. Abaikan jika pembayaran telah dilakukan.</i>
+          </p> -->
+        </div>
+      </field>
+      <field name="auto_delete" eval="True"/>
+    </record>
+  </data>
+</odoo>
-- 
cgit v1.2.3


From d32684d5d69a76c97ac962e898f3bb58f708fca4 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 25 Sep 2025 11:06:24 +0700
Subject: (andri) penambahan perihal penutupan tempo pada surat piutang

---
 indoteknik_custom/models/letter_receivable.py      |  20 +-
 .../report/report_surat_piutang copy.xml           | 149 -------------
 indoteknik_custom/report/report_tutup_tempo.xml    | 241 +++++++++++++++++++++
 .../views/close_tempo_mail_template.xml            |  77 +++++++
 indoteknik_custom/views/letter_receivable.xml      |   1 +
 5 files changed, 336 insertions(+), 152 deletions(-)
 delete mode 100644 indoteknik_custom/report/report_surat_piutang copy.xml
 create mode 100644 indoteknik_custom/report/report_tutup_tempo.xml
 create mode 100644 indoteknik_custom/views/close_tempo_mail_template.xml

diff --git a/indoteknik_custom/models/letter_receivable.py b/indoteknik_custom/models/letter_receivable.py
index 16034938..6f95e5e7 100644
--- a/indoteknik_custom/models/letter_receivable.py
+++ b/indoteknik_custom/models/letter_receivable.py
@@ -23,6 +23,7 @@ class SuratPiutang(models.Model):
     tujuan_nama = fields.Char(string="Nama Tujuan", tracking=True)
     tujuan_email = fields.Char(string="Email Tujuan", tracking=True)
     perihal = fields.Selection([
+        ('tutup_tempo', 'Surat Penutupan Pembayaran Tempo'),
         ('penagihan', 'Surat Resmi Penagihan'),
         ('sp1', 'Surat Peringatan Piutang ke-1'),
         ('sp2', 'Surat Peringatan Piutang ke-2'),
@@ -36,6 +37,7 @@ class SuratPiutang(models.Model):
         ("sent", "Approved & Sent")
     ], default="draft", tracking=True)
     send_date = fields.Datetime(string="Tanggal Kirim", tracking=True)
+    due_date = fields.Date(string="Tanggal Jatuh Tempo", tracking=True, default= fields.Date.today)
     seven_days_after_sent_date = fields.Char(string="7 Hari Setelah Tanggal Kirim")
     periode_invoices_terpilih = fields.Char(
         string="Periode Invoices Terpilih",
@@ -228,14 +230,14 @@ class SuratPiutang(models.Model):
                     continue
 
             # === Surat penagihan biasa (langsung Pimpinan approve) ===
-            if rec.perihal == "penagihan":
+            if rec.perihal in ("tutup_tempo", "penagihan"):
                 # if self.env.user.id not in pimpinan_user_ids:
                 #     raise UserError("Hanya Pimpinan yang boleh menyetujui surat penagihan.")
                 rec.state = "sent"
                 now_utc = now_wib.astimezone(pytz.UTC).replace(tzinfo=None)
                 rec.send_date = now_utc
                 rec.action_send_letter()
-                rec.message_post(body="Surat Penagihan disetujui dan berhasil dikirim.")
+                rec.message_post(body=f"{rec.perihal_label} disetujui dan berhasil dikirim.")
 
                 self.env.user.notify_info(
                     message=f"Surat piutang {rec.name} berhasil dikirim ke {rec.partner_id.name} ({rec.tujuan_email})",
@@ -453,6 +455,18 @@ class SuratPiutang(models.Model):
                 body=f"Line Invoices diperbarui. Total line saat ini: {len(rec.line_ids)}"
             )
 
+    @api.onchange('perihal', 'partner_id')
+    def _onchange_perihal_tutup_tempo(self):
+        if self.perihal == 'tutup_tempo':
+            for line in self.line_ids:
+                if line.new_invoice_day_to_due < -30:
+                    line.selected = True
+                else:
+                    line.selected = False
+        else:
+            for line in self.line_ids:
+                line.selected = False
+
     @api.model
     def create(self, vals):
         # Generate nomor surat otomatis
@@ -462,7 +476,7 @@ class SuratPiutang(models.Model):
             bulan_romawi = ["I","II","III","IV","V","VI","VII","VIII","IX","X","XI","XII"][today.month-1]
             tahun = today.strftime("%y")
             vals["name"] = f"{seq}/LO/FAT/IDG/{bulan_romawi}/{tahun}"
-        if vals.get("perihal") == "penagihan":
+        if vals.get("perihal") in ("tutup_tempo", "penagihan"):
             vals["state"] = "waiting_approval_pimpinan"
         else:
             vals["state"] = "waiting_approval_sales"
diff --git a/indoteknik_custom/report/report_surat_piutang copy.xml b/indoteknik_custom/report/report_surat_piutang copy.xml
deleted file mode 100644
index cb5762f3..00000000
--- a/indoteknik_custom/report/report_surat_piutang copy.xml	
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-
-        <!-- External Layout tanpa company -->
-        <template id="external_layout_no_company">
-            <!-- HEADER -->
-            <div class="header">
-                <img t-att-src="'https://erp.indoteknik.com/api/image/ir.attachment/datas/2498521'"
-                     class="img img-fluid w-100"/>
-            </div>
-
-            <!-- CONTENT -->
-            <div class="content mt-5 mb-5 ml-3 mr-3">
-                <t t-raw="0"/>
-            </div>
-
-            <!-- FOOTER -->
-            <div class="footer">
-                <img t-att-src="'https://erp.indoteknik.com/api/image/ir.attachment/datas/2498529'"
-                     style="height:60px;"/>
-            </div>
-        </template>
-
-        <!-- Report Action -->
-        <record id="action_report_surat_piutang" model="ir.actions.report">
-            <field name="name">Surat Peringatan Piutang</field>
-            <field name="model">surat.piutang</field>
-            <field name="report_type">qweb-pdf</field>
-            <field name="report_name">indoteknik_custom.report_surat_piutang_formal_custom</field>
-            <field name="report_file">indoteknik_custom.report_surat_piutang_formal_custom</field>
-            <field name="binding_model_id" ref="model_surat_piutang"/>
-            <field name="binding_type">report</field>
-        </record>
-
-        <!-- QWeb Template Surat -->
-        <template id="report_surat_piutang_formal_custom">
-            <t t-call="indoteknik_custom.external_layout_no_company">
-                <t t-set="doc" t-value="docs[0] if docs else None"/>
-
-                <!-- SURAT CONTENT -->
-                <main class="o_report_layout_standard" style="font-size:12pt; font-family: Arial, sans-serif;">
-
-                    <!-- Header Surat -->
-                    <div class="row mb-3">
-                        <div class="col-6">
-                            Ref. No: <t t-esc="doc.name or '-'"/>
-                        </div>
-                        <div class="col-6 text-right">
-                            Jakarta, <t t-esc="doc.send_date and doc.send_date.strftime('%d %B %Y') or '-'"/>
-                        </div>
-                    </div>
-
-                    <!-- Tujuan -->
-                    <div class="mb-3">
-                        <strong>Kepada Yth.</strong><br/>
-                        <t t-esc="doc.partner_id.name if doc and doc.partner_id else '-'"/><br/>
-                        <t t-esc="doc.partner_id.street if doc and doc.partner_id else '-'"/><br/>
-                        <t t-esc="doc.partner_id.country_id.name if doc and doc.partner_id and doc.partner_id.country_id else '-'"/>
-                    </div>
-
-                    <!-- UP & Perihal -->
-                    <div class="mb-4">
-                        U.P. : <t t-esc="doc.tujuan_nama or '-'"/><br/>
-                        <strong>Perihal:</strong> <t t-esc="doc.perihal or '-'"/>
-                    </div>
-
-                    <!-- Isi Surat -->
-                    <div class="mb-3">Dengan Hormat,</div>
-                    <div class="mb-3">Yang bertanda tangan di bawah ini menyampaikan sebagai berikut:</div>
-
-                    <div class="mb-3 text-justify">
-                        Namun, bersama surat ini kami ingin mengingatkan bahwa hingga tanggal surat ini dibuat, masih terdapat tagihan yang belum diselesaikan oleh pihak 
-                        <t t-esc="doc.partner_id.name if doc and doc.partner_id else '-'"/> periode bulan <t t-esc="doc.periode_invoices_terpilih or '-'"/>, berdasarkan data korespondensi dan laporan keuangan yang kami kelola, 
-                        <t t-esc="doc.partner_id.name if doc and doc.partner_id else '-'"/> (“Saudara”) masih mempunyai tagihan yang telah jatuh tempo dan belum dibayarkan sejumlah 
-                        <t t-esc="doc.grand_total_text or '-'"/> (“Tagihan”).
-                    </div>
-
-                    <div class="mb-3">Berikut kami lampirkan Rincian Tagihan yang telah Jatuh Tempo:</div>
-
-                    <!-- Tabel Invoice -->
-                    <table class="table table-sm table-bordered mb-4">
-                        <thead class="thead-light">
-                            <tr>
-                                <th>Invoice Number</th>
-                                <th>Invoice Date</th>
-                                <th>Due Date</th>
-                                <th class="text-center">Day to Due</th>
-                                <th>Reference</th>
-                                <th class="text-right">Amount Due</th>
-                                <th>Payment Terms</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <t t-foreach="doc.line_ids.filtered(lambda l: l.selected)" t-as="line">
-                                <tr>
-                                    <td><t t-esc="line.invoice_number or '-'"/></td>
-                                    <td><t t-esc="line.invoice_date and line.invoice_date.strftime('%d-%m-%Y') or '-'"/></td>
-                                    <td><t t-esc="line.invoice_date_due and line.invoice_date_due.strftime('%d-%m-%Y') or '-'"/></td>
-                                    <td class="text-center"><t t-esc="line.new_invoice_day_to_due or '-'"/></td>
-                                    <td><t t-esc="line.ref or '-'"/></td>
-                                    <td class="text-right"><t t-esc="line.amount_residual or '-'"/></td>
-                                    <td><t t-esc="line.payment_term_id.name or '-'"/></td>
-                                </tr>
-                            </t>
-                        </tbody>
-                        <tfoot>
-                            <tr class="font-weight-bold">
-                                <td colspan="6" class="text-right">
-                                    GRAND TOTAL INVOICE YANG BELUM DIBAYAR DAN TELAH JATUH TEMPO
-                                </td>
-                                <td class="text-right">
-                                    <t t-esc="doc.grand_total or '-'"/> (<t t-esc="doc.grand_total_text or '-'"/>)
-                                </td>
-                            </tr>
-                        </tfoot>
-                    </table>
-
-                    <!-- Isi Penutup -->
-                    <div class="mb-3">
-                        Kami belum menerima konfirmasi pelunasan ataupun pembayaran sebagian dari total kewajiban tersebut. Kami sangat terbuka untuk berdiskusi serta mencari solusi terbaik agar kerja sama tetap berjalan baik.
-                    </div>
-
-                    <div class="mb-3">
-                        Oleh karena itu, kami mohon perhatian dan itikad baik dari pihak <t t-esc="doc.partner_id.name if doc and doc.partner_id else '-'"/> untuk segera melakukan pelunasan atau memberikan informasi terkait rencana pembayaran paling lambat dalam waktu 7 (tujuh) hari kerja sejak surat ini diterima.
-                    </div>
-
-                    <div class="mb-3">
-                        Jika dalam waktu yang telah ditentukan belum ada penyelesaian atau tanggapan, kami akan mempertimbangkan untuk melanjutkan proses sesuai ketentuan yang berlaku.
-                    </div>
-
-                    <div class="mb-4">
-                        Demikian kami sampaikan. Atas perhatian dan kerja samanya, kami ucapkan terima kasih.
-                    </div>
-
-                    <div class="mb-2">Hormat kami,</div>
-
-                    <!-- TTD -->
-                    <div class="mt-5">
-                        <img t-att-src="'https://erp.indoteknik.com/api/image/ir.attachment/datas/2851919'" style="width:200px; height:auto;"/><br/>
-                        <div>Nama: Akbar Prabawa<br/>Jabatan: General Manager</div>
-                    </div>
-
-                </main>
-            </t>
-        </template>
-
-    </data>
-</odoo>
diff --git a/indoteknik_custom/report/report_tutup_tempo.xml b/indoteknik_custom/report/report_tutup_tempo.xml
new file mode 100644
index 00000000..e4647119
--- /dev/null
+++ b/indoteknik_custom/report/report_tutup_tempo.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <!-- Report Action -->
+        <record id="action_report_surat_piutang" model="ir.actions.report">
+            <field name="name">Surat Penutupan Tempo</field>
+            <field name="model">surat.piutang</field>
+            <field name="report_type">qweb-pdf</field>
+            <field name="report_name">indoteknik_custom.report_surat_piutang</field>
+            <field name="report_file">indoteknik_custom.report_surat_piutang</field>
+            <field name="print_report_name">'%s - %s' % (object.perihal_label or '', object.partner_id.name or '')</field>
+            <field name="binding_model_id" ref="model_surat_piutang"/>
+            <field name="binding_type">report</field>
+        </record>
+
+        <template id="external_layout_surat_piutang">
+            <t t-call="web.html_container">
+
+                <!-- Header -->
+                <div class="header">
+                    <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2498521"
+                        style="width:100%; display: block;"/>
+                </div>
+
+                <!-- Body -->
+                <div class="article" style="margin: 0 1.5cm 0 1.5cm; ">
+                    <t t-raw="0"/>
+                </div>
+
+                <!-- Footer -->
+                <div class="footer">
+                    <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2859765"
+                        style="width:100%; display: block;"/>
+                </div>
+            </t>
+        </template>
+
+
+
+        <!-- Wrapper Template -->
+        <template id="report_surat_piutang">
+            <t t-call="web.html_container">
+                <t t-foreach="docs" t-as="doc">
+                    <t t-call="indoteknik_custom.report_surat_piutang_document"
+                       t-lang="doc.partner_id.lang"/>
+                </t>
+            </t>
+        </template>
+
+        <!-- Document Template -->
+        <template id="report_surat_piutang_document">
+            <t t-call="indoteknik_custom.external_layout_surat_piutang">
+                <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)"/>
+                <div class="page">
+
+                    <!-- Ref & Date -->
+                    <div class="row mb3">
+                        <div class="col-6">
+                            Ref. No: <t t-esc="doc.name or '-'"/>
+                        </div>
+                        <div class="col-6 text-right">
+                            Jakarta, <t t-esc="doc.send_date and doc.send_date.strftime('%d %B %Y') or '-'"/>
+                        </div>
+                    </div>
+                    <br/>
+                    <!-- Tujuan -->
+                    <div class="mb3" style="max-width:500px; word-wrap:break-word; white-space:normal;">
+                        <strong>Kepada Yth.</strong><br/>
+                        <strong><t t-esc="doc.partner_id.name or '-'"/></strong><br/>
+                        <span style="display:inline-block; max-width:400px; word-wrap:break-word; white-space:normal;">
+                            <t t-esc="doc.partner_id.street or ''"/>
+                        </span><br/>
+                        <u>Republik Indonesia</u>
+                    </div>
+                    <br/>
+
+                    <!-- UP & Perihal -->
+                    <table style="margin-left:2cm;">
+                        <tr style="font-weight: bold;">
+                            <td style="padding-right:10px;">U.P.</td>
+                            <td style="white-space: nowrap;">: <t t-esc="doc.tujuan_nama or '-'"/></td>
+                        </tr>
+                        <tr style="font-weight: bold;">
+                            <td style="padding-right:10px;">Perihal</td>
+                            <td>: <u><t t-esc="doc.perihal_label or '-'"/></u></td>
+                        </tr>
+                    </table>
+
+                    <br/>
+
+                    <!-- Isi Surat -->
+                    <p><strong>Dengan Hormat,</strong></p>
+                    <p>Yang bertanda tangan di bawah ini:</p>
+
+                    <p class="text-justify">
+                        <strong>PT. Indoteknik Dotcom Gemilang</strong>, suatu perseroan terbatas yang didirikan berdasarkan hukum Negara Republik
+                        Indonesia, yang beralamat di Jalan Bandengan Utara 85A No. 8-9, RT.003/RW.016, Penjaringan, Penjaringan, Jakarta
+                        Utara, DKI Jakarta 14440, Republik Indonesia, dalam hal ini diwakili secara sah oleh Akbar Prabawa selaku General
+                        Manager, dengan ini menyampaikan sebagai berikut:
+                    </p>
+
+                    <p class="text-justify">
+                        Kami mengucapkan terima kasih atas kerja sama yang telah terjalin dengan baik selama ini antara perusahaan kami
+                        dengan <strong><t t-esc="doc.partner_id.name or '-'"/></strong>.
+                    </p>
+
+                    <p class="text-justify">
+                        Namun, bersama surat ini kami ingin mengingatkan bahwa hingga tanggal surat ini dibuat, masih terdapat tagihan yang
+                        belum diselesaikan oleh pihak <strong><t t-esc="doc.partner_id.name or '-'"/></strong> kepada kami periode bulan
+                        <t t-esc="doc.periode_invoices_terpilih or '-'"/>, bahwa berdasarkan data korespondensi dan laporan keuangan yang kami kelola, 
+                        <t t-esc="doc.partner_id.name or '-'"/> <b>(“Saudara”)</b> masih mempunyai tagihan yang telah jatuh tempo dan belum dibayarkan sejumlah 
+                        <t t-esc="doc.grand_total_text or '-'"/> <b>(“Tagihan”)</b>.
+                    </p>
+
+                    <p>Berikut kami lampirkan Rincian Tagihan yang telah Jatuh Tempo:</p>
+
+                    <!-- Tabel Invoice -->
+                    <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; 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="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>
+
+
+                    <!-- Penutup -->
+                    <p class="text-justify">
+                        Kami belum menerima konfirmasi pelunasan ataupun pembayaran sebagian dari total kewajiban tersebut dan kami
+                        memahami bahwa setiap perusahaan bisa saja menghadapi kendala operasional maupun keuangan, dan kami sangat
+                        terbuka untuk berdiskusi serta mencari solusi terbaik bersama agar kerja sama kita tetap berjalan baik ke depannya.
+                    </p>
+
+                    <p class="text-justify">
+                        Oleh karena itu, kami mohon perhatian dan itikad baik dari pihak <strong><t t-esc="doc.partner_id.name or '-'"/></strong>
+                        untuk segera melakukan pelunasan atau memberikan informasi terkait rencana pembayaran paling lambat dalam waktu 7 (tujuh) hari kerja sejak surat ini diterima.
+                    </p>
+
+                    <p class="text-justify">
+                        Jika dalam waktu yang telah ditentukan belum ada penyelesaian atau tanggapan, kami akan mempertimbangkan untuk
+                        melanjutkan proses sesuai ketentuan yang berlaku.
+                    </p>
+
+                    <p class="text-justify">
+                        Demikian kami sampaikan. Atas perhatian dan kerja samanya, kami ucapkan terima kasih.
+                    </p>
+                    <div class="mt32" style="page-break-inside: avoid;">
+                        <p>Hormat kami,<br/>
+                            <strong>PT. Indoteknik Dotcom Gemilang</strong>
+                        </p>
+
+                        <div style="height:120px; position: relative;">
+                            <t t-if="doc.perihal != 'penagihan'">
+                                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2851919"
+                                    style="width:300px; height:auto; margin-top:-40px;"/>
+                            </t>
+                            <t t-else="">
+                                <div style="height:100px;"></div>
+                            </t>
+                        </div>
+                        <table style="margin-top:10px;">
+                            <tr style="border-top:1px solid #000; font-weight: bold;">
+                                <td style="padding-right:50px; white-space: nowrap;">Nama</td>
+                                <td>: Akbar Prabawa</td>
+                            </tr>
+                            <tr style="font-weight: bold;">
+                                <td style="padding-right:50px; white-space: nowrap;">Jabatan</td>
+                                <td>: General Manager</td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+            </t>
+        </template>
+
+    </data>
+</odoo>
diff --git a/indoteknik_custom/views/close_tempo_mail_template.xml b/indoteknik_custom/views/close_tempo_mail_template.xml
new file mode 100644
index 00000000..f1e66d40
--- /dev/null
+++ b/indoteknik_custom/views/close_tempo_mail_template.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <data noupdate="0">
+    <record id="close_tempo_mail_template" model="mail.template">
+      <field name="name">Surat Penutupan Tempo</field>
+      <field name="model_id" ref="indoteknik_custom.model_surat_piutang"/>
+      <field name="subject"></field>
+      <field name="email_from">finance@indoteknik.co.id</field>
+      <field name="email_to"></field>
+      <field name="body_html" type="html">
+        <div style="font-family:Arial, sans-serif; font-size:13px; color:#333;">
+            <div><b>Dengan hormat,</b></div>
+            <br/>
+            <div>Kepada Yth.</div>
+            <div><b>Manajemen ${object.partner_id.name}</b></div>
+            <br/>
+            <div>
+                Melalui email ini, kami ingin mengingatkan kembali terkait kewajiban pembayaran 
+                ${object.partner_id.name} atas transaksi dengan rincian sebagai berikut:
+            </div>
+            <br/>
+
+          <table cellpadding="6" cellspacing="0" width="100%" 
+                 style="border-collapse:collapse; font-size:12px; border:1px solid #ddd;">
+            <thead>
+              <tr style="background-color:#f2f2f2; text-align:left;">
+                <th style="border:1px solid #ddd;">Invoice Number</th>
+                <th style="border:1px solid #ddd;">Customer</th>
+                <th style="border:1px solid #ddd;">Invoice Date</th>
+                <th style="border:1px solid #ddd;">Due Date</th>
+                <th style="border:1px solid #ddd;">Days To Due</th>
+                <th style="border:1px solid #ddd;">Reference</th>
+                <th style="border:1px solid #ddd;">Amount Due Signed</th>
+                <th style="border:1px solid #ddd;">Payment Terms</th>
+              </tr>
+            </thead>
+            <tbody>
+              <!-- baris invoice akan diinject dari Python -->
+            </tbody>
+          </table>
+
+          <p>
+            Hingga saat ini, kami belum menerima pembayaran atas tagihan tersebut. 
+            Mohon konfirmasi dan tindak lanjut dari pihak saudara paling lambat pada 
+            tanggal <b>${object.seven_days_after_sent_date}</b> (7 hari setelah email ini dikirimkan).
+          </p>
+
+          <p>
+            Sebagai informasi, kami lampirkan <b>${object.perihal}</b> untuk menjadi perhatian. 
+            Jika tidak ada tanggapan atau penyelesaian dalam batas waktu tersebut, kami akan 
+            melanjutkan dengan pengiriman surat peringatan berikutnya dan mengambil langkah-langkah 
+            penyelesaian sesuai ketentuan yang berlaku.
+          </p>
+
+          <p>
+            Demikian kami sampaikan. Atas perhatian dan kerja samanya, kami ucapkan terima kasih.
+          </p>
+
+          <br/><br/>
+          <p>
+            <b>
+              Best Regards,<br/><br/>
+              Widya R.<br/>
+              Dept. Finance<br/>
+              PT. INDOTEKNIK DOTCOM GEMILANG<br/>
+              <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" 
+                   alt="Indoteknik" style="max-width:18%; height:auto;"/><br/>
+              <a href="https://wa.me/6285716970374" target="_blank">+62-857-1697-0374</a> | 
+              <a href="mailto:finance@indoteknik.co.id">finance@indoteknik.co.id</a>
+            </b>
+          </p>
+        </div>
+      </field>
+      <field name="auto_delete" eval="True"/>
+    </record>
+  </data>
+</odoo>
diff --git a/indoteknik_custom/views/letter_receivable.xml b/indoteknik_custom/views/letter_receivable.xml
index 98ea7768..4810909f 100644
--- a/indoteknik_custom/views/letter_receivable.xml
+++ b/indoteknik_custom/views/letter_receivable.xml
@@ -81,6 +81,7 @@
                             <field name="tujuan_nama" attrs="{'readonly':[('state','=','sent')]}"/>
                             <field name="tujuan_email" attrs="{'readonly':[('state','=','sent')]}"/>
                             <field name="perihal" attrs="{'readonly':[('state','=','sent')]}"/>
+                            <field name="due_date" attrs="{'invisible': [('perihal', '!=', 'tutup_tempo')]}"/>
                             <field name="partner_id" options="{'no_create': True}" attrs="{'readonly':[('state','=','sent')]}"/>
                         </group>    
                         <group>
-- 
cgit v1.2.3


From 1b574687a7f4b612a1fd221da1ca920009cc963b Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 25 Sep 2025 14:33:51 +0700
Subject: (andri) make report & mail template close tempo

---
 indoteknik_custom/__manifest__.py                  |   3 +-
 indoteknik_custom/models/letter_receivable.py      | 145 ++++++++-------
 indoteknik_custom/report/report_surat_piutang.xml  |   4 +-
 indoteknik_custom/report/report_tutup_tempo.xml    | 198 +++++----------------
 .../views/close_tempo_mail_template.xml            |  85 ++++-----
 5 files changed, 167 insertions(+), 268 deletions(-)

diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py
index 90fa915f..b083be70 100755
--- a/indoteknik_custom/__manifest__.py
+++ b/indoteknik_custom/__manifest__.py
@@ -167,6 +167,7 @@
         'report/report_picking.xml',
         'report/report_sale_order.xml',
         'report/report_surat_piutang.xml',
+        'report/report_tutup_tempo.xml',
         'report/purchase_report.xml',
         'views/vendor_sla.xml',
         'views/coretax_faktur.xml',
@@ -184,7 +185,7 @@
         'views/letter_receivable_mail_template.xml',
         # 'views/reimburse.xml',
         'views/sj_tele.xml',
-        'views/mail_template_closing_apt.xml',
+        'views/close_tempo_mail_template.xml',
     ],
     'demo': [],
     'css': [],
diff --git a/indoteknik_custom/models/letter_receivable.py b/indoteknik_custom/models/letter_receivable.py
index 6f95e5e7..bfa1e966 100644
--- a/indoteknik_custom/models/letter_receivable.py
+++ b/indoteknik_custom/models/letter_receivable.py
@@ -244,6 +244,13 @@ class SuratPiutang(models.Model):
                     title="Informasi",
                     sticky=False
                 )
+    
+    def action_print(self):
+        self.ensure_one()
+        if self.perihal == 'tutup_tempo':
+            return self.env.ref('indoteknik_custom.action_report_surat_tutup_tempo').report_action(self)
+        else:
+            return self.env.ref('indoteknik_custom.action_report_surat_piutang').report_action(self)
                 
     def action_send_letter(self):
         self.ensure_one()
@@ -255,64 +262,79 @@ class SuratPiutang(models.Model):
         if not self.tujuan_email:
             raise UserError(_("Email tujuan harus diisi."))
 
-        template = self.env.ref('indoteknik_custom.letter_receivable_mail_template')
-        # today = fields.Date.today()
-
-        month_map = {
-                    1: "Januari", 2: "Februari", 3: "Maret", 4: "April",
-                    5: "Mei", 6: "Juni", 7: "Juli", 8: "Agustus",
-                    9: "September", 10: "Oktober", 11: "November", 12: "Desember",
-                }
-        target_date = (self.send_date or fields.Datetime.now()).date() + timedelta(days=7)
-        self.seven_days_after_sent_date = f"{target_date.day} {month_map[target_date.month]}"
-        
-        perihal_map = {
-            'penagihan': 'Surat Resmi Penagihan',
-            'sp1': 'Surat Peringatan Pertama (I)',
-            'sp2': 'Surat Peringatan Kedua (II)',
-            'sp3': 'Surat Peringatan Ketiga (III)',
-        }
-        perihal_text = perihal_map.get(self.perihal, self.perihal or '')
-        
-        invoice_table_rows = ""
-        grand_total = 0
-        for line in selected_lines:
-            # days_to_due = (line.invoice_date_due - today).days if line.invoice_date_due else 0
-            grand_total += line.amount_residual
-            invoice_table_rows += f"""
-                <tr>
-                    <td>{line.invoice_number or '-'}</td>
-                    <td>{self.partner_id.name or '-'}</td>
-                    <td>{fields.Date.to_string(line.invoice_date) or '-'}</td>
-                    <td>{fields.Date.to_string(line.invoice_date_due) or '-'}</td>
-                    <td>{line.new_invoice_day_to_due}</td>
-                    <td>{line.ref or '-'}</td>
-                    <td>{formatLang(self.env, line.amount_residual, currency_obj=line.currency_id)}</td>
-                    <td>{line.payment_term_id.name or '-'}</td>
-                </tr>
-            """
-
-        invoice_table_footer = f"""
-                <tfoot>
-                    <tr style="font-weight:bold; background-color:#f9f9f9;">
-                        <td colspan="6" align="right">Grand Total</td>
-                        <td>{formatLang(self.env, grand_total, currency_obj=self.currency_id, monetary=True)}</td>
-                        <td colspan="2"></td>
+        template = None
+        report = None
+        body_html = None
+        subject = None
+
+        # Logika untuk memilih template dan report berdasarkan 'perihal'
+        if self.perihal == 'tutup_tempo':
+            template = self.env.ref('indoteknik_custom.close_tempo_mail_template')
+            report = self.env.ref('indoteknik_custom.action_report_surat_tutup_tempo')
+            due_date_str = self.due_date.strftime('%d %B %Y') if self.due_date else 'yang telah ditentukan'
+            body_html = template.body_html \
+                .replace('${object.partner_id.name}', self.partner_id.name or '') \
+                .replace('${object.due_date}', due_date_str or '') 
+            subject = f"Pemberitahuan Penutupan Pembayaran Tempo – {self.partner_id.name}"
+        else:
+            template = self.env.ref('indoteknik_custom.letter_receivable_mail_template')
+            
+            month_map = {
+                1: "Januari", 2: "Februari", 3: "Maret", 4: "April",
+                5: "Mei", 6: "Juni", 7: "Juli", 8: "Agustus",
+                9: "September", 10: "Oktober", 11: "November", 12: "Desember",
+            }
+            target_date = (self.send_date or fields.Datetime.now()).date() + timedelta(days=7)
+            self.seven_days_after_sent_date = f"{target_date.day} {month_map[target_date.month]}"
+            
+            perihal_map = {
+                'penagihan': 'Surat Resmi Penagihan',
+                'sp1': 'Surat Peringatan Pertama (I)',
+                'sp2': 'Surat Peringatan Kedua (II)',
+                'sp3': 'Surat Peringatan Ketiga (III)',
+            }
+            perihal_text = perihal_map.get(self.perihal, self.perihal or '')
+            
+            invoice_table_rows = ""
+            grand_total = 0
+            for line in selected_lines:
+                grand_total += line.amount_residual
+                invoice_table_rows += f"""
+                    <tr>
+                        <td>{line.invoice_number or '-'}</td>
+                        <td>{self.partner_id.name or '-'}</td>
+                        <td>{fields.Date.to_string(line.invoice_date) or '-'}</td>
+                        <td>{fields.Date.to_string(line.invoice_date_due) or '-'}</td>
+                        <td>{line.new_invoice_day_to_due}</td>
+                        <td>{line.ref or '-'}</td>
+                        <td>{formatLang(self.env, line.amount_residual, currency_obj=line.currency_id)}</td>
+                        <td>{line.payment_term_id.name or '-'}</td>
                     </tr>
-                </tfoot>
-            """
-        # inject table rows ke template
-        body_html = re.sub(
-            r"<tbody[^>]*>.*?</tbody>",
-            f"<tbody>{invoice_table_rows}</tbody>{invoice_table_footer}",
-            template.body_html,
-            flags=re.DOTALL
-        ).replace('${object.name}', self.name or '') \
-         .replace('${object.partner_id.name}', self.partner_id.name or '') \
-         .replace('${object.seven_days_after_sent_date}', self.seven_days_after_sent_date or '') \
-         .replace('${object.perihal}', perihal_text or '')
-
-        report = self.env.ref('indoteknik_custom.action_report_surat_piutang')  
+                """
+
+            invoice_table_footer = f"""
+                    <tfoot>
+                        <tr style="font-weight:bold; background-color:#f9f9f9;">
+                            <td colspan="6" align="right">Grand Total</td>
+                            <td>{formatLang(self.env, grand_total, currency_obj=self.currency_id, monetary=True)}</td>
+                            <td colspan="2"></td>
+                        </tr>
+                    </tfoot>
+                """
+            
+            body_html = re.sub(
+                r"<tbody[^>]*>.*?</tbody>",
+                f"<tbody>{invoice_table_rows}</tbody>{invoice_table_footer}",
+                template.body_html,
+                flags=re.DOTALL
+            ).replace('${object.name}', self.name or '') \
+            .replace('${object.partner_id.name}', self.partner_id.name or '') \
+            .replace('${object.seven_days_after_sent_date}', self.seven_days_after_sent_date or '') \
+            .replace('${object.perihal}', perihal_text or '')
+
+            report = self.env.ref('indoteknik_custom.action_report_surat_piutang')
+            subject = perihal_map.get(self.perihal, self.perihal or '') + " - " + (self.partner_id.name or '')
+
         pdf_content, _ = report._render_qweb_pdf([self.id])
         attachment_base64 = base64.b64encode(pdf_content)
 
@@ -337,14 +359,13 @@ class SuratPiutang(models.Model):
             cc_list.append(sales_email)
 
         values = {
-            # 'subject': template.subject.replace('${object.name}', self.name or ''),
-            'subject': perihal_map.get(self.perihal, self.perihal or '') + " - " + (self.partner_id.name or ''),
+            'subject': subject, # Menggunakan subject yang sudah ditentukan di atas
             'email_to': self.tujuan_email,
             'email_from': 'finance@indoteknik.co.id',
-            'email_cc': ",".join(sorted(set(cc_list))),
-            'body_html': body_html,
+            # 'email_cc': ",".join(sorted(set(cc_list))),
+            'body_html': body_html, # Menggunakan body_html yang sudah ditentukan di atas
             'attachments': [(attachment.name, attachment.datas)],
-            'reply_to': 'finance@indoteknik.co.id',
+            # 'reply_to': 'finance@indoteknik.co.id',
         }
 
         template.with_context(mail_post_autofollow=False).send_mail(
diff --git a/indoteknik_custom/report/report_surat_piutang.xml b/indoteknik_custom/report/report_surat_piutang.xml
index 62db7982..fc5593a7 100644
--- a/indoteknik_custom/report/report_surat_piutang.xml
+++ b/indoteknik_custom/report/report_surat_piutang.xml
@@ -10,8 +10,8 @@
             <field name="report_name">indoteknik_custom.report_surat_piutang</field>
             <field name="report_file">indoteknik_custom.report_surat_piutang</field>
             <field name="print_report_name">'%s - %s' % (object.perihal_label or '', object.partner_id.name or '')</field>
-            <field name="binding_model_id" ref="model_surat_piutang"/>
-            <field name="binding_type">report</field>
+            <!-- <field name="binding_model_id" ref="model_surat_piutang"/>
+            <field name="binding_type">report</field> -->
         </record>
 
         <template id="external_layout_surat_piutang">
diff --git a/indoteknik_custom/report/report_tutup_tempo.xml b/indoteknik_custom/report/report_tutup_tempo.xml
index e4647119..38208be9 100644
--- a/indoteknik_custom/report/report_tutup_tempo.xml
+++ b/indoteknik_custom/report/report_tutup_tempo.xml
@@ -1,34 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
+        <record id="action_print_surat_piutang_server" model="ir.actions.server">
+            <field name="name">Cetak Surat</field>
+            <field name="model_id" ref="indoteknik_custom.model_surat_piutang"/>
+            <field name="binding_model_id" ref="indoteknik_custom.model_surat_piutang"/>
+            <field name="binding_view_types">form</field>
+            <field name="state">code</field>
+            <field name="code">
+        action = records.action_print()
+            </field>
+        </record>
 
-        <!-- Report Action -->
-        <record id="action_report_surat_piutang" model="ir.actions.report">
+        <record id="action_report_surat_tutup_tempo" model="ir.actions.report">
             <field name="name">Surat Penutupan Tempo</field>
             <field name="model">surat.piutang</field>
             <field name="report_type">qweb-pdf</field>
-            <field name="report_name">indoteknik_custom.report_surat_piutang</field>
-            <field name="report_file">indoteknik_custom.report_surat_piutang</field>
+            <field name="report_name">indoteknik_custom.report_surat_tutup_tempo</field>
+            <field name="report_file">indoteknik_custom.report_surat_tutup_tempo</field>
             <field name="print_report_name">'%s - %s' % (object.perihal_label or '', object.partner_id.name or '')</field>
-            <field name="binding_model_id" ref="model_surat_piutang"/>
-            <field name="binding_type">report</field>
+            <!-- <field name="binding_model_id" ref="model_surat_piutang"/>
+            <field name="binding_type">report</field> -->
         </record>
 
-        <template id="external_layout_surat_piutang">
+        <template id="external_layout_surat_tutup_tempo">
             <t t-call="web.html_container">
-
-                <!-- Header -->
                 <div class="header">
                     <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2498521"
                         style="width:100%; display: block;"/>
                 </div>
-
-                <!-- Body -->
                 <div class="article" style="margin: 0 1.5cm 0 1.5cm; ">
                     <t t-raw="0"/>
                 </div>
-
-                <!-- Footer -->
                 <div class="footer">
                     <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2859765"
                         style="width:100%; display: block;"/>
@@ -36,25 +39,20 @@
             </t>
         </template>
 
-
-
-        <!-- Wrapper Template -->
-        <template id="report_surat_piutang">
+        <template id="report_surat_tutup_tempo">
             <t t-call="web.html_container">
                 <t t-foreach="docs" t-as="doc">
-                    <t t-call="indoteknik_custom.report_surat_piutang_document"
+                    <t t-call="indoteknik_custom.report_surat_tutup_tempo_document"
                        t-lang="doc.partner_id.lang"/>
                 </t>
             </t>
         </template>
 
-        <!-- Document Template -->
-        <template id="report_surat_piutang_document">
-            <t t-call="indoteknik_custom.external_layout_surat_piutang">
+        <template id="report_surat_tutup_tempo_document">
+            <t t-call="indoteknik_custom.external_layout_surat_tutup_tempo">
                 <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)"/>
                 <div class="page">
 
-                    <!-- Ref & Date -->
                     <div class="row mb3">
                         <div class="col-6">
                             Ref. No: <t t-esc="doc.name or '-'"/>
@@ -64,7 +62,6 @@
                         </div>
                     </div>
                     <br/>
-                    <!-- Tujuan -->
                     <div class="mb3" style="max-width:500px; word-wrap:break-word; white-space:normal;">
                         <strong>Kepada Yth.</strong><br/>
                         <strong><t t-esc="doc.partner_id.name or '-'"/></strong><br/>
@@ -74,8 +71,6 @@
                         <u>Republik Indonesia</u>
                     </div>
                     <br/>
-
-                    <!-- UP & Perihal -->
                     <table style="margin-left:2cm;">
                         <tr style="font-weight: bold;">
                             <td style="padding-right:10px;">U.P.</td>
@@ -86,156 +81,59 @@
                             <td>: <u><t t-esc="doc.perihal_label or '-'"/></u></td>
                         </tr>
                     </table>
-
                     <br/>
 
-                    <!-- Isi Surat -->
-                    <p><strong>Dengan Hormat,</strong></p>
-                    <p>Yang bertanda tangan di bawah ini:</p>
-
-                    <p class="text-justify">
-                        <strong>PT. Indoteknik Dotcom Gemilang</strong>, suatu perseroan terbatas yang didirikan berdasarkan hukum Negara Republik
-                        Indonesia, yang beralamat di Jalan Bandengan Utara 85A No. 8-9, RT.003/RW.016, Penjaringan, Penjaringan, Jakarta
-                        Utara, DKI Jakarta 14440, Republik Indonesia, dalam hal ini diwakili secara sah oleh Akbar Prabawa selaku General
-                        Manager, dengan ini menyampaikan sebagai berikut:
-                    </p>
-
-                    <p class="text-justify">
-                        Kami mengucapkan terima kasih atas kerja sama yang telah terjalin dengan baik selama ini antara perusahaan kami
-                        dengan <strong><t t-esc="doc.partner_id.name or '-'"/></strong>.
-                    </p>
-
-                    <p class="text-justify">
-                        Namun, bersama surat ini kami ingin mengingatkan bahwa hingga tanggal surat ini dibuat, masih terdapat tagihan yang
-                        belum diselesaikan oleh pihak <strong><t t-esc="doc.partner_id.name or '-'"/></strong> kepada kami periode bulan
-                        <t t-esc="doc.periode_invoices_terpilih or '-'"/>, bahwa berdasarkan data korespondensi dan laporan keuangan yang kami kelola, 
-                        <t t-esc="doc.partner_id.name or '-'"/> <b>(“Saudara”)</b> masih mempunyai tagihan yang telah jatuh tempo dan belum dibayarkan sejumlah 
-                        <t t-esc="doc.grand_total_text or '-'"/> <b>(“Tagihan”)</b>.
-                    </p>
-
-                    <p>Berikut kami lampirkan Rincian Tagihan yang telah Jatuh Tempo:</p>
-
-                    <!-- Tabel Invoice -->
-                    <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; 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="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>
-
-
-                    <!-- Penutup -->
-                    <p class="text-justify">
-                        Kami belum menerima konfirmasi pelunasan ataupun pembayaran sebagian dari total kewajiban tersebut dan kami
-                        memahami bahwa setiap perusahaan bisa saja menghadapi kendala operasional maupun keuangan, dan kami sangat
-                        terbuka untuk berdiskusi serta mencari solusi terbaik bersama agar kerja sama kita tetap berjalan baik ke depannya.
-                    </p>
+                    <t t-set="invoice_numbers_str" t-value="', '.join(doc.line_ids.filtered(lambda l: l.selected).mapped('invoice_number'))"/>
 
+                    <p><strong>Dengan Hormat,</strong></p>
                     <p class="text-justify">
-                        Oleh karena itu, kami mohon perhatian dan itikad baik dari pihak <strong><t t-esc="doc.partner_id.name or '-'"/></strong>
-                        untuk segera melakukan pelunasan atau memberikan informasi terkait rencana pembayaran paling lambat dalam waktu 7 (tujuh) hari kerja sejak surat ini diterima.
+                        Berdasarkan catatan kami, pembayaran atas invoice 
+                        <strong><t t-esc="invoice_numbers_str"/></strong> 
+                        yang jatuh tempo pada tanggal 
+                        <strong><t t-esc="doc.due_date and doc.due_date.strftime('%d %B %Y')"/></strong> 
+                        telah melewati batas waktu 30 (tiga puluh) hari. Sehubungan dengan hal tersebut, bersama ini kami sampaikan kebijakan perusahaan sebagai berikut:
                     </p>
-
+                    
+                    <ol style="padding-left: 1.5em; margin-bottom: 1em;">
+                        <li class="text-justify" style="margin-bottom: 0.5em;">
+                            Secara sistem, akun akan otomatis terkunci (locked) apabila pembayaran telah melewati 30 (tiga puluh) hari dari tanggal jatuh tempo.
+                        </li>
+                        <li class="text-justify" style="margin-bottom: 0.5em;">
+                            Payment term yang semula Tempo akan otomatis berubah menjadi <strong>Cash Before Delivery (CBD)</strong>.
+                        </li>
+                        <li class="text-justify">
+                            Apabila Bapak/Ibu telah melakukan konfirmasi pembayaran atau memberikan informasi lanjutan terkait pelunasan, maka payment term dapat dibukakan kembali menjadi Tempo berdasarkan pengajuan dari tim Sales kami.
+                        </li>
+                    </ol>
+                    
                     <p class="text-justify">
-                        Jika dalam waktu yang telah ditentukan belum ada penyelesaian atau tanggapan, kami akan mempertimbangkan untuk
-                        melanjutkan proses sesuai ketentuan yang berlaku.
+                        Kebijakan ini kami terapkan untuk menjaga kelancaran proses transaksi serta memastikan hubungan kerja sama dapat terus berjalan dengan baik.
                     </p>
-
+                    
                     <p class="text-justify">
-                        Demikian kami sampaikan. Atas perhatian dan kerja samanya, kami ucapkan terima kasih.
+                        Atas perhatian dan kerja samanya kami ucapkan terima kasih.
                     </p>
                     <div class="mt32" style="page-break-inside: avoid;">
                         <p>Hormat kami,<br/>
                             <strong>PT. Indoteknik Dotcom Gemilang</strong>
                         </p>
-
                         <div style="height:120px; position: relative;">
-                            <t t-if="doc.perihal != 'penagihan'">
-                                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2851919"
-                                    style="width:300px; height:auto; margin-top:-40px;"/>
-                            </t>
-                            <t t-else="">
-                                <div style="height:100px;"></div>
-                            </t>
+                            <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2869838"
+                                style="width:300px; height:auto; margin-left:-20px;"/>
                         </div>
                         <table style="margin-top:10px;">
                             <tr style="border-top:1px solid #000; font-weight: bold;">
                                 <td style="padding-right:50px; white-space: nowrap;">Nama</td>
-                                <td>: Akbar Prabawa</td>
+                                <td>: Stephan Christianus</td>
                             </tr>
                             <tr style="font-weight: bold;">
                                 <td style="padding-right:50px; white-space: nowrap;">Jabatan</td>
-                                <td>: General Manager</td>
+                                <td>: FAT Manager</td>
                             </tr>
                         </table>
                     </div>
                 </div>
             </t>
         </template>
-
     </data>
-</odoo>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/close_tempo_mail_template.xml b/indoteknik_custom/views/close_tempo_mail_template.xml
index f1e66d40..0f16d3ef 100644
--- a/indoteknik_custom/views/close_tempo_mail_template.xml
+++ b/indoteknik_custom/views/close_tempo_mail_template.xml
@@ -4,9 +4,9 @@
     <record id="close_tempo_mail_template" model="mail.template">
       <field name="name">Surat Penutupan Tempo</field>
       <field name="model_id" ref="indoteknik_custom.model_surat_piutang"/>
-      <field name="subject"></field>
+      <field name="subject">${object.perihal_label} - ${object.partner_id.name}</field>
       <field name="email_from">finance@indoteknik.co.id</field>
-      <field name="email_to"></field>
+      <field name="email_to">${object.tujuan_email}</field>
       <field name="body_html" type="html">
         <div style="font-family:Arial, sans-serif; font-size:13px; color:#333;">
             <div><b>Dengan hormat,</b></div>
@@ -15,63 +15,42 @@
             <div><b>Manajemen ${object.partner_id.name}</b></div>
             <br/>
             <div>
-                Melalui email ini, kami ingin mengingatkan kembali terkait kewajiban pembayaran 
-                ${object.partner_id.name} atas transaksi dengan rincian sebagai berikut:
+                Bersama email ini, kami sampaikan surat pemberitahuan resmi terkait <strong>penutupan pembayaran tempo</strong> 
+                yang selama ini berlaku bagi ${object.partner_id.name}.
             </div>
             <br/>
 
-          <table cellpadding="6" cellspacing="0" width="100%" 
-                 style="border-collapse:collapse; font-size:12px; border:1px solid #ddd;">
-            <thead>
-              <tr style="background-color:#f2f2f2; text-align:left;">
-                <th style="border:1px solid #ddd;">Invoice Number</th>
-                <th style="border:1px solid #ddd;">Customer</th>
-                <th style="border:1px solid #ddd;">Invoice Date</th>
-                <th style="border:1px solid #ddd;">Due Date</th>
-                <th style="border:1px solid #ddd;">Days To Due</th>
-                <th style="border:1px solid #ddd;">Reference</th>
-                <th style="border:1px solid #ddd;">Amount Due Signed</th>
-                <th style="border:1px solid #ddd;">Payment Terms</th>
-              </tr>
-            </thead>
-            <tbody>
-              <!-- baris invoice akan diinject dari Python -->
-            </tbody>
-          </table>
-
-          <p>
-            Hingga saat ini, kami belum menerima pembayaran atas tagihan tersebut. 
-            Mohon konfirmasi dan tindak lanjut dari pihak saudara paling lambat pada 
-            tanggal <b>${object.seven_days_after_sent_date}</b> (7 hari setelah email ini dikirimkan).
-          </p>
-
-          <p>
-            Sebagai informasi, kami lampirkan <b>${object.perihal}</b> untuk menjadi perhatian. 
-            Jika tidak ada tanggapan atau penyelesaian dalam batas waktu tersebut, kami akan 
-            melanjutkan dengan pengiriman surat peringatan berikutnya dan mengambil langkah-langkah 
-            penyelesaian sesuai ketentuan yang berlaku.
-          </p>
-
-          <p>
-            Demikian kami sampaikan. Atas perhatian dan kerja samanya, kami ucapkan terima kasih.
-          </p>
+            <div>
+                <b>Terhitung mulai tanggal ${object.due_date}</b>, 
+                seluruh transaksi dengan ${object.partner_id.name} akan diberlakukan dengan sistem pembayaran 
+                <b>Cash Before Delivery (CBD)</b>.
+            </div>
+            
+            <p>
+                Adapun surat resminya kami lampirkan, apabila diperlukan klarifikasi atau penyesuaian terkait kebijakan ini, 
+                kami terbuka untuk mendiskusikannya lebih lanjut.
+            </p>
+            <br/>
+            <p>
+                Atas perhatian dan kerja samanya, kami ucapkan terima kasih.
+            </p>
 
-          <br/><br/>
-          <p>
-            <b>
-              Best Regards,<br/><br/>
-              Widya R.<br/>
-              Dept. Finance<br/>
-              PT. INDOTEKNIK DOTCOM GEMILANG<br/>
-              <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" 
-                   alt="Indoteknik" style="max-width:18%; height:auto;"/><br/>
-              <a href="https://wa.me/6285716970374" target="_blank">+62-857-1697-0374</a> | 
-              <a href="mailto:finance@indoteknik.co.id">finance@indoteknik.co.id</a>
-            </b>
-          </p>
+            <br/><br/>
+            <p>
+              <b>
+                Best Regards,<br/><br/>
+                Widya R.<br/>
+                Dept. Finance<br/>
+                PT. INDOTEKNIK DOTCOM GEMILANG<br/>
+                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" 
+                     alt="Indoteknik" style="max-width:18%; height:auto;"/><br/>
+                <a href="https://wa.me/6285716970374" target="_blank">+62-857-1697-0374</a> | 
+                <a href="mailto:finance@indoteknik.co.id">finance@indoteknik.co.id</a>
+              </b>
+            </p>
         </div>
       </field>
       <field name="auto_delete" eval="True"/>
     </record>
   </data>
-</odoo>
+</odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 16147def7eb5765ac0d1e0870efe70176a7a618c Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 25 Sep 2025 15:00:35 +0700
Subject: (andri) fix signature

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

diff --git a/indoteknik_custom/report/report_surat_piutang.xml b/indoteknik_custom/report/report_surat_piutang.xml
index fc5593a7..f41ae604 100644
--- a/indoteknik_custom/report/report_surat_piutang.xml
+++ b/indoteknik_custom/report/report_surat_piutang.xml
@@ -216,7 +216,7 @@
                         <div style="height:120px; position: relative;">
                             <t t-if="doc.perihal != 'penagihan'">
                                 <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2851919"
-                                    style="width:300px; height:auto; margin-top:-40px;"/>
+                                    style="width:300px; height:auto; margin-top:-40px; margin-left:-20px;"/>
                             </t>
                             <t t-else="">
                                 <div style="height:100px;"></div>
-- 
cgit v1.2.3


From 31a22f2f26b29f91bd43ea48ce84e8dc9aaf3c12 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 25 Sep 2025 15:35:43 +0700
Subject: fix

---
 indoteknik_custom/models/letter_receivable.py   |  2 +-
 indoteknik_custom/report/report_tutup_tempo.xml | 10 ----------
 indoteknik_custom/views/letter_receivable.xml   |  1 +
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/indoteknik_custom/models/letter_receivable.py b/indoteknik_custom/models/letter_receivable.py
index bfa1e966..ffe14491 100644
--- a/indoteknik_custom/models/letter_receivable.py
+++ b/indoteknik_custom/models/letter_receivable.py
@@ -375,7 +375,7 @@ class SuratPiutang(models.Model):
         )
 
         _logger.info(
-            f"Surat Piutang {self.name} terkirim ke {self.tujuan_email} "
+            f"{self.name} terkirim ke {self.tujuan_email} "
             f"({self.partner_id.name}), total {len(selected_lines)} invoice."
         )
 
diff --git a/indoteknik_custom/report/report_tutup_tempo.xml b/indoteknik_custom/report/report_tutup_tempo.xml
index 38208be9..6c9cfc95 100644
--- a/indoteknik_custom/report/report_tutup_tempo.xml
+++ b/indoteknik_custom/report/report_tutup_tempo.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="action_print_surat_piutang_server" model="ir.actions.server">
-            <field name="name">Cetak Surat</field>
-            <field name="model_id" ref="indoteknik_custom.model_surat_piutang"/>
-            <field name="binding_model_id" ref="indoteknik_custom.model_surat_piutang"/>
-            <field name="binding_view_types">form</field>
-            <field name="state">code</field>
-            <field name="code">
-        action = records.action_print()
-            </field>
-        </record>
 
         <record id="action_report_surat_tutup_tempo" model="ir.actions.report">
             <field name="name">Surat Penutupan Tempo</field>
diff --git a/indoteknik_custom/views/letter_receivable.xml b/indoteknik_custom/views/letter_receivable.xml
index 4810909f..7f946c04 100644
--- a/indoteknik_custom/views/letter_receivable.xml
+++ b/indoteknik_custom/views/letter_receivable.xml
@@ -26,6 +26,7 @@
             <form string="Surat Piutang">
                 <header>
                     <field name="state" widget="statusbar" statusbar_visible="draft,waiting_approval_sales,waiting_approval_pimpinan,sent"/>
+                    <button name="action_print" string="Print" type="object" />
                     <button name="action_approve"
                         type="object"
                         string="Approve"
-- 
cgit v1.2.3


From 6582949e6e8f7017b8b44ed937d6042d8794fbc5 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Fri, 26 Sep 2025 15:23:48 +0700
Subject: (andri) inv table jika data lebih dari 1

---
 indoteknik_custom/report/report_tutup_tempo.xml | 51 +++++++++++++++++++------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/indoteknik_custom/report/report_tutup_tempo.xml b/indoteknik_custom/report/report_tutup_tempo.xml
index 6c9cfc95..1aa1367d 100644
--- a/indoteknik_custom/report/report_tutup_tempo.xml
+++ b/indoteknik_custom/report/report_tutup_tempo.xml
@@ -72,18 +72,47 @@
                         </tr>
                     </table>
                     <br/>
+                    <p><strong>Dengan Hormat,</strong></p>
+                    <t t-set="selected_lines" t-value="doc.line_ids.filtered(lambda l: l.selected)"/>
+                    <t t-set="line_count" t-value="len(selected_lines)"/>
+                    <t t-if="line_count == 1">
+                        <t t-set="line" t-value="selected_lines[0]"/>
+                        <p class="text-justify">
+                            Berdasarkan catatan kami, pembayaran atas invoice 
+                            <strong><t t-esc="line.invoice_number"/></strong> 
+                            yang jatuh tempo pada tanggal 
+                            <strong><t t-esc="line.invoice_date_due and line.invoice_date_due.strftime('%d %B %Y')"/></strong> 
+                            telah melewati batas waktu 30 (tiga puluh) hari. Sehubungan dengan hal tersebut, bersama ini kami sampaikan kebijakan perusahaan sebagai berikut:
+                        </p>
+                    </t>
 
-                    <t t-set="invoice_numbers_str" t-value="', '.join(doc.line_ids.filtered(lambda l: l.selected).mapped('invoice_number'))"/>
+                    <t t-else="">
+                        <p class="text-justify">
+                            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;">
+                            <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>
+                                </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>
+                            </tbody>
+                        </table>
+
+                        <p class="text-justify">
+                            Sehubungan dengan hal tersebut, bersama ini kami sampaikan kebijakan perusahaan sebagai berikut:
+                        </p>
+                    </t>
 
-                    <p><strong>Dengan Hormat,</strong></p>
-                    <p class="text-justify">
-                        Berdasarkan catatan kami, pembayaran atas invoice 
-                        <strong><t t-esc="invoice_numbers_str"/></strong> 
-                        yang jatuh tempo pada tanggal 
-                        <strong><t t-esc="doc.due_date and doc.due_date.strftime('%d %B %Y')"/></strong> 
-                        telah melewati batas waktu 30 (tiga puluh) hari. Sehubungan dengan hal tersebut, bersama ini kami sampaikan kebijakan perusahaan sebagai berikut:
-                    </p>
-                    
                     <ol style="padding-left: 1.5em; margin-bottom: 1em;">
                         <li class="text-justify" style="margin-bottom: 0.5em;">
                             Secara sistem, akun akan otomatis terkunci (locked) apabila pembayaran telah melewati 30 (tiga puluh) hari dari tanggal jatuh tempo.
@@ -109,7 +138,7 @@
                         </p>
                         <div style="height:120px; position: relative;">
                             <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2869838"
-                                style="width:300px; height:auto; margin-left:-20px;"/>
+                                 style="width:300px; height:auto; margin-left:-20px;"/>
                         </div>
                         <table style="margin-top:10px;">
                             <tr style="border-top:1px solid #000; font-weight: bold;">
-- 
cgit v1.2.3


From ec21c4721f35028fc9b2a61bd0dbc6e4bf600e74 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Sun, 28 Sep 2025 10:43:27 +0700
Subject: <Miqdad> fix state retur ccm stuck at waiting for operation

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

diff --git a/indoteknik_custom/models/tukar_guling.py b/indoteknik_custom/models/tukar_guling.py
index c683f75a..cb630a04 100644
--- a/indoteknik_custom/models/tukar_guling.py
+++ b/indoteknik_custom/models/tukar_guling.py
@@ -538,6 +538,11 @@ class TukarGuling(models.Model):
         self.state = 'approval_sales'
 
     def update_doc_state(self):
+        bu_pick = self.env['stock.picking'].search([
+            ('origin', '=', self.operations.origin),
+            ('name', 'ilike', 'BU/PICK'),
+        ])
+
         # OUT tukar guling
         if self.operations.picking_type_id.id == 29 and self.return_type == 'tukar_guling':
             total_out = self.env['stock.picking'].search_count([
@@ -552,7 +557,26 @@ class TukarGuling(models.Model):
             if self.state == 'approved' and total_out > 0 and done_out == total_out:
                 self.state = 'done'
 
-        # OUT revisi SO
+        #SO Lama (gk ada bu pick)
+        elif self.operations.picking_type_id.id == 29 and self.return_type == 'retur_so' and not bu_pick:
+            # so_lama = self.env['sale.order'].search([
+            #     ('name', '=', self.operations.origin),
+            #     ('state', '=', 'done'),
+            #     ('group_id.name', '=', self.operations.origin)
+            #     ])
+            total_ort = self.env['stock.picking'].search_count([
+                ('tukar_guling_id', '=', self.id),
+                ('picking_type_id', '=', 74),
+            ])
+            done_srt = self.env['stock.picking'].search([
+                ('tukar_guling_id', '=', self.id),
+                ('picking_type_id', '=', 73),
+                ('state', '=', 'done')
+            ])
+            if self.state == 'approved' and total_ort == 0 and done_srt and not bu_pick:
+                self.state = 'done'
+
+        # OUT retur SO
         elif self.operations.picking_type_id.id == 29 and self.return_type == 'retur_so':
             total_ort = self.env['stock.picking'].search_count([
                 ('tukar_guling_id', '=', self.id),
-- 
cgit v1.2.3


From 6239b00631bd709557349d8d3635001659b83d93 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 29 Sep 2025 15:17:43 +0700
Subject: push

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

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index b27e6b5d..ae4f64a8 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -152,6 +152,7 @@ class StockPicking(models.Model):
     state_reserve = fields.Selection([
         ('waiting', 'Waiting For Fullfilment'),
         ('ready', 'Ready to Ship'),
+        ('partial', 'Ready to Ship Partial'),
         ('done', 'Done'),
         ('cancel', 'Cancelled'),
     ], string='Status Reserve', tracking=True, copy=False, help="The current state of the stock picking.")
@@ -393,7 +394,7 @@ class StockPicking(models.Model):
                 deadline = kirim_date + timedelta(days=1)
                 deadline = deadline.replace(hour=10, minute=0, second=0)
 
-                if now > deadline:
+                if now > deadline and not self.so_lama:
                     raise ValidationError(
                         _("Anda tidak dapat mengubah Tanggal Kirim setelah jam 10:00 pada hari berikutnya!")
                     )
-- 
cgit v1.2.3


From 98b252296ad6ed1b4d1f8f95b327f09826407c7f Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 29 Sep 2025 16:06:01 +0700
Subject: (andri) penyesuaian alert

---
 indoteknik_custom/views/letter_receivable.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/indoteknik_custom/views/letter_receivable.xml b/indoteknik_custom/views/letter_receivable.xml
index 7f946c04..98186862 100644
--- a/indoteknik_custom/views/letter_receivable.xml
+++ b/indoteknik_custom/views/letter_receivable.xml
@@ -45,6 +45,12 @@
                         attrs="{'invisible':[('state', '!=', 'draft')]}">
                         Selamat Datang di form Pengajuan Surat Piutang, Pastikan data sudah benar sebelum mengajukan approval.
                 </div>
+                <div class="alert alert-info"
+                        role="alert"
+                        style="height: 40px; margin-bottom:0px;"
+                        attrs="{'invisible': ['|', ('perihal', '!=', 'tutup_tempo'), ('state', '!=', 'waiting_approval_pimpinan')]}">
+                        <strong>Info!</strong> Surat penutupan tempo telah diajukan &amp; surat otomatis terkirim bila telah di approve.
+                </div>
                 <div class="alert alert-info"
                         role="alert"
                         style="height: 40px; margin-bottom:0px;"
@@ -61,7 +67,7 @@
                 <div class="alert alert-info"
                     role="alert"
                     style="margin-bottom:0px;"
-                    attrs="{'invisible': ['|', ('perihal', '=', 'penagihan'), ('state', '!=', 'waiting_approval_pimpinan')]}">
+                    attrs="{'invisible': ['|', ('perihal', 'in', ['penagihan', 'tutup_tempo']), ('state', '!=', 'waiting_approval_pimpinan')]}">
                     <strong>Info!</strong> Surat peringatan piutang ini sedang menunggu persetujuan dari <b>Pimpinan</b>. 
                     Silakan hubungi Pimpinan terkait untuk melakukan approval agar surat dapat terkirim otomatis ke customer.
                 </div>
-- 
cgit v1.2.3


From a66344ded40391a3a2591581141d2d44ed1ad712 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 29 Sep 2025 16:07:26 +0700
Subject: (andri) del

---
 indoteknik_custom/models/approval_payment_term.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/indoteknik_custom/models/approval_payment_term.py b/indoteknik_custom/models/approval_payment_term.py
index fbdabe7f..e45305db 100644
--- a/indoteknik_custom/models/approval_payment_term.py
+++ b/indoteknik_custom/models/approval_payment_term.py
@@ -56,9 +56,6 @@ class ApprovalPaymentTerm(models.Model):
 
     change_log_688 = fields.Text(string="Change Log", readonly=True, copy=False)
 
-    def button_closing_mail(self):
-
-        return 
 
     def write(self, vals):
         # Ambil nilai lama sebelum perubahan
-- 
cgit v1.2.3


From 1f58d7d4973edf04d6a3f3092115492585c1545b Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 30 Sep 2025 08:09:02 +0700
Subject: <Miqdad> Need approval logistic when IU from BU/Stock

---
 indoteknik_api/controllers/api_v1/stock_picking.py |  7 +++----
 indoteknik_custom/models/stock_picking.py          | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index a4a9cf80..7f878ad2 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -136,16 +136,15 @@ class StockPicking(controller.Controller):
         }
         dispatch_emails = {
             'rahmat.afiudin@gmail.com',
-            'it@fixcomart.co.id'
+            'indraprtama60@gmail.com'
         }
 
         login = (request.env.user.login or '').lower()
         is_dispatch_user = login in dispatch_emails
         is_driver_user   = (login in driver_emails) and not is_dispatch_user
 
-        # ===== Validasi minimal =====
-        if not sj_document or not paket_document:
-            return self.response(code=400, description='dispatch_document wajib untuk role dispatch login= %s' % login)
+        # if not sj_document or not paket_document:
+        #     return self.response(code=400, description='dispatch_document wajib untuk role dispatch login= %s' % login)
 
         # if is_dispatch_user and not dispatch_document and not is_driver_user:
         #     return self.response(code=400, description='dispatch_document wajib untuk role dispatch login= %s' % login)
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index b27e6b5d..51f4cccd 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -97,6 +97,7 @@ class StockPicking(models.Model):
 
     approval_status = fields.Selection([
         ('pengajuan1', 'Approval Accounting'),
+        ('pengajuan2', 'Approval Logistic'),
         ('approved', 'Approved'),
     ], string='Approval Status', readonly=True, copy=False, index=True, tracking=3,
         help="Approval Status untuk Internal Use")
@@ -1082,6 +1083,10 @@ class StockPicking(models.Model):
     def ask_approval(self):
         if self.env.user.is_accounting:
             raise UserError("Bisa langsung Validate")
+        if self.env.user.is_logistic_approver and self.location_id.id == 57 or self.location_id== 57:
+            raise UserError("Bisa langsung Validate")
+
+
 
         # for calendar distribute only
         # if self.is_internal_use:
@@ -1104,6 +1109,9 @@ class StockPicking(models.Model):
                 if line.qty_done <= 0:
                     raise UserError("Qty tidak boleh 0")
             pick.approval_status = 'pengajuan1'
+            if pick.location_id.id == 57:
+                pick.approval_status = 'pengajuan2'
+                return
 
     def ask_receipt_approval(self):
         if self.env.user.is_logistic_approver:
@@ -1306,6 +1314,9 @@ class StockPicking(models.Model):
         if self.picking_type_id.code == 'incoming' and self.group_id.id == False and self.is_internal_use == False:
             raise UserError(_('Tidak bisa Validate jika tidak dari Document SO / PO'))
 
+        if self.is_internal_use and not self.env.user.is_logistic_approver and self.location_id.id == 57:
+            raise UserError("Harus di Approve oleh Logistik")
+
         if self.is_internal_use and not self.env.user.is_accounting:
             raise UserError("Harus di Approve oleh Accounting")
 
@@ -1348,6 +1359,9 @@ class StockPicking(models.Model):
                         )
 
         self.validation_minus_onhand_quantity()
+        loc = self.location_id
+        if loc.id == 57 and not self.env.user.is_logistic_approver and self.approval_status in ['pengajuan2']:
+            raise UserError ("Harus Ask Approval Logistik")
         self.responsible = self.env.user.id
         # self.send_koli_to_so()
         if self.picking_type_code == 'outgoing' and 'BU/OUT/' in self.name:
-- 
cgit v1.2.3


From e92f83f5938966aa6b171be3743ea853d1cffdc7 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 30 Sep 2025 13:46:42 +0700
Subject: <Miqdad> remove p putra from appove user pengajuan request tempo

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

diff --git a/indoteknik_custom/models/user_pengajuan_tempo_request.py b/indoteknik_custom/models/user_pengajuan_tempo_request.py
index 600381c0..8ed92fc8 100644
--- a/indoteknik_custom/models/user_pengajuan_tempo_request.py
+++ b/indoteknik_custom/models/user_pengajuan_tempo_request.py
@@ -381,7 +381,8 @@ class UserPengajuanTempoRequest(models.Model):
                 if tempo.env.user.id in (688, 28, 7):
                     raise UserError("Pengajuan tempo harus di approve oleh sales manager terlebih dahulu")
                 else:
-                    if tempo.env.user.id not in (375, 19):
+                    # if tempo.env.user.id not in (375, 19):
+                    if tempo.env.user.id != 19:
                     # if tempo.env.user.id != 12182:
                         raise UserError("Pengajuan tempo hanya bisa di approve oleh sales manager")
                     else:
-- 
cgit v1.2.3


From 6adb1cb5fe8dbe85b971dc1cad476718f24c38cb Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Wed, 1 Oct 2025 13:49:26 +0700
Subject: (andri) add validasi approval pimpinan jika PO biasa tidak ada
 matches SO dan PO PJ terdapat matches SO line dengan SO margin <=15%

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

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index b34ec926..a76cdab1 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1069,6 +1069,19 @@ class PurchaseOrder(models.Model):
                 ) % order.name)
                 
     def button_confirm(self):
+        if self.env.user.id != 7: # Pimpinan
+            if '/PJ/' in self.name:
+                low_margin_lines = self.order_sales_match_line.filtered(
+                    lambda match: match.sale_line_id.item_percent_margin <= 34.0
+                )
+                if low_margin_lines:
+                    raise UserError("Matches SO terdapat item dengan margin SO <= 15%. Approval Pimpinan diperlukan.")
+            else:
+                is_po_manual = '/A/' not in self.name and '/MO/' not in self.name
+                if is_po_manual:
+                    if not self.order_sales_match_line:
+                        raise UserError("Tidak ada matches SO, Approval Pimpinan diperlukan.")
+
         self._check_assets_note() 
         # self._check_payment_term() # check payment term 
         res = super(PurchaseOrder, self).button_confirm()
-- 
cgit v1.2.3


From c04dd5a6a38ba35b30a39ed6596514679067e541 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Wed, 1 Oct 2025 15:10:10 +0700
Subject: (andri) add so header margin pada matches SO + fix

---
 indoteknik_custom/models/purchase_order.py             | 4 ++--
 indoteknik_custom/models/purchase_order_sales_match.py | 5 +++++
 indoteknik_custom/views/purchase_order.xml             | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index a76cdab1..1a88d036 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1072,10 +1072,10 @@ class PurchaseOrder(models.Model):
         if self.env.user.id != 7: # Pimpinan
             if '/PJ/' in self.name:
                 low_margin_lines = self.order_sales_match_line.filtered(
-                    lambda match: match.sale_line_id.item_percent_margin <= 34.0
+                    lambda match: match.so_header_margin <= 34.0
                 )
                 if low_margin_lines:
-                    raise UserError("Matches SO terdapat item dengan margin SO <= 15%. Approval Pimpinan diperlukan.")
+                    raise UserError("Matches SO terdapat item dengan header margin SO <= 15%. Approval Pimpinan diperlukan.")
             else:
                 is_po_manual = '/A/' not in self.name and '/MO/' not in self.name
                 if is_po_manual:
diff --git a/indoteknik_custom/models/purchase_order_sales_match.py b/indoteknik_custom/models/purchase_order_sales_match.py
index 084b93f7..ea25a3b1 100644
--- a/indoteknik_custom/models/purchase_order_sales_match.py
+++ b/indoteknik_custom/models/purchase_order_sales_match.py
@@ -29,6 +29,11 @@ class PurchaseOrderSalesMatch(models.Model):
     purchase_line_id = fields.Many2one('purchase.order.line', string='Purchase Line', compute='_compute_purchase_line_id')
     hold_outgoing_so = fields.Boolean(string='Hold Outgoing SO', related='sale_id.hold_outgoing')
     bu_pick = fields.Many2one('stock.picking', string='BU Pick', compute='compute_bu_pick')
+    so_header_margin = fields.Float(
+        related='sale_id.total_percent_margin',
+        string='SO Header Margin %',
+        readonly=True
+    )
 
     def compute_bu_pick(self):
         for rec in self:
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 7feec934..437b86b8 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -390,6 +390,7 @@
                     <field name="hold_outgoing_so" optional="hide"/>
                     <field name="bu_pick" optional="hide"/>
                     <field name="margin_so"/>
+                    <field name="so_header_margin" optional="hide"/>
                 </tree>
             </field>
         </record>
-- 
cgit v1.2.3


From eb8a67a33b4b8abd574f737bc5727ffdb5b18b99 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 1 Oct 2025 17:12:48 +0700
Subject: <Miqdad> remove email mapping

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

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index 7f878ad2..deb92a50 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -129,20 +129,6 @@ class StockPicking(controller.Controller):
         paket_document    = kw.get('paket_document', False)
         dispatch_document = kw.get('dispatch_document', False)
 
-        # ===== Role by EMAIL =====
-        driver_emails = {
-            'driverindoteknik@gmail.com',
-            'sulistianaridwan8@gmail.com',
-        }
-        dispatch_emails = {
-            'rahmat.afiudin@gmail.com',
-            'indraprtama60@gmail.com'
-        }
-
-        login = (request.env.user.login or '').lower()
-        is_dispatch_user = login in dispatch_emails
-        is_driver_user   = (login in driver_emails) and not is_dispatch_user
-
         # if not sj_document or not paket_document:
         #     return self.response(code=400, description='dispatch_document wajib untuk role dispatch login= %s' % login)
 
-- 
cgit v1.2.3


From 50d5643a2c4a7b245b37f8ca0dd4fc5383e61d4e Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 2 Oct 2025 08:22:30 +0700
Subject: <Miqdad> vals SP doc

---
 indoteknik_api/controllers/api_v1/stock_picking.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index deb92a50..2ec1ec2a 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -125,15 +125,9 @@ class StockPicking(controller.Controller):
     @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', False)
-        paket_document    = kw.get('paket_document', False)
-        dispatch_document = kw.get('dispatch_document', False)
-
-        # if not sj_document or not paket_document:
-        #     return self.response(code=400, description='dispatch_document wajib untuk role dispatch login= %s' % login)
-
-        # if is_dispatch_user and not dispatch_document and not is_driver_user:
-        #     return self.response(code=400, description='dispatch_document wajib untuk role dispatch login= %s' % login)
+        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
 
         # ===== Cari picking by id / picking_code =====
         picking_data = False
@@ -147,10 +141,12 @@ class StockPicking(controller.Controller):
             return self.response(code=403, description='picking not found')
 
         params = {
-            'sj_documentation': sj_document,
-            'paket_documentation': paket_document,
             'driver_arrival_date': datetime.utcnow(),
         }
+        if sj_document:
+            params['sj_documentation'] = sj_document
+        if paket_document:
+            params['paket_documentation'] = paket_document
         if dispatch_document:
             params['dispatch_documentation'] = dispatch_document
 
-- 
cgit v1.2.3


From ae360ebbe575c5ede395b0b396b9627b89b0e226 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 2 Oct 2025 13:53:42 +0700
Subject: fix bug

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

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 16e235da..ae7121da 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -2552,9 +2552,22 @@ class ScanKoli(models.Model):
                 out_moves = self.env['stock.move.line'].search([('picking_id', '=', picking.linked_out_picking_id.id)])
 
                 for pick_move in pick_moves:
-                    corresponding_out_move = out_moves.filtered(lambda m: m.product_id == pick_move.product_id)
-                    if corresponding_out_move:
-                        corresponding_out_move.qty_done += pick_move.qty_done
+                    corresponding_out_moves = out_moves.filtered(lambda m: m.product_id == pick_move.product_id)
+
+                    if len(corresponding_out_moves) == 1:
+                        corresponding_out_moves.qty_done += pick_move.qty_done
+
+                    elif len(corresponding_out_moves) > 1:
+                        qty_koli = pick_move.qty_done
+                        for out_move in corresponding_out_moves:
+                            if qty_koli <= 0:
+                                break
+                            # ambil sesuai kebutuhan atau sisa qty
+                            qty_to_assign = min(qty_koli, out_move.product_uom_qty)
+                            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)])
-- 
cgit v1.2.3


From 6baf4d55e6dbaef2f5bd270a18effa55a821677a Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 2 Oct 2025 14:45:43 +0700
Subject: push

---
 indoteknik_custom/models/mrp_production.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/indoteknik_custom/models/mrp_production.py b/indoteknik_custom/models/mrp_production.py
index b39995b5..4ebfa244 100644
--- a/indoteknik_custom/models/mrp_production.py
+++ b/indoteknik_custom/models/mrp_production.py
@@ -21,6 +21,21 @@ class MrpProduction(models.Model):
     ], string='Status Reserve', tracking=True, copy=False, help="The current state of the stock picking.")
     date_reserved = fields.Datetime(string="Date Reserved", help='Tanggal ter-reserved semua barang nya', copy=False)
 
+    def action_cancel(self):
+        for production in self:
+            moves_with_forecast = production.move_raw_ids.filtered(
+                lambda m: m.forecast_availability > 0
+            )
+            if moves_with_forecast:
+                # bikin list produk per baris
+                product_list = "\n".join(
+                    "- %s" % p.display_name for p in moves_with_forecast.mapped('product_id')
+                )
+                raise UserError(_(
+                    "You cannot cancel this Manufacturing Order because the following raw materials "
+                    "still have forecast availability:\n\n%s" % product_list
+                ))
+        return super(MrpProduction, self).action_cancel()
 
     @api.constrains('check_bom_product_lines')
     def constrains_check_bom_product_lines(self):
-- 
cgit v1.2.3


From 67294c9cacdf2e4da1348c41cb23a02d50aea374 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 2 Oct 2025 15:38:34 +0700
Subject: fixb ug

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

diff --git a/indoteknik_custom/models/mrp_production.py b/indoteknik_custom/models/mrp_production.py
index 4ebfa244..30956082 100644
--- a/indoteknik_custom/models/mrp_production.py
+++ b/indoteknik_custom/models/mrp_production.py
@@ -24,8 +24,9 @@ class MrpProduction(models.Model):
     def action_cancel(self):
         for production in self:
             moves_with_forecast = production.move_raw_ids.filtered(
-                lambda m: m.forecast_availability > 0
+                lambda m: m.reserved_availability > 0
             )
+
             if moves_with_forecast:
                 # bikin list produk per baris
                 product_list = "\n".join(
-- 
cgit v1.2.3


From 35d01765f9b925467b6ac20d2ff83c81f49e4d3e Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 2 Oct 2025 16:03:44 +0700
Subject: <Miqdad> fix cannot apply voucher when cart has promotion item

---
 indoteknik_api/controllers/api_v1/sale_order.py | 10 +++-
 indoteknik_custom/models/sale_order.py          | 65 ++++++++++++++++++++-----
 2 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 1a75c830..25268856 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -808,6 +808,14 @@ class SaleOrder(controller.Controller):
                 sale_order.apply_promotion_program()
                 sale_order.add_free_product(promotions)
 
+                # Pastikan baris hasil promo/bonus ditandai supaya bisa di-skip voucher
+                promo_lines = sale_order.order_line.filtered(
+                    lambda l: getattr(l, 'order_promotion_id', False) or (l.price_unit or 0.0) == 0.0
+                )
+                if promo_lines:
+                    promo_lines.write({'is_has_disc': True})
+                    _logger.info(f"[PROMO_MARK] Marked {len(promo_lines)} promo/free lines as is_has_disc=True")
+
             voucher_code = params['value']['voucher']
             if voucher_code:
                 _logger.info(f"Processing voucher: {voucher_code}")
@@ -816,7 +824,7 @@ class SaleOrder(controller.Controller):
                 voucher_shipping = request.env['voucher'].search(
                     [('code', '=', voucher_code), ('apply_type', 'in', ['shipping'])], limit=1)
 
-                if voucher and len(promotions) == 0:
+                if voucher:
                     _logger.info("Applying regular voucher")
                     sale_order.voucher_id = voucher.id
                     sale_order.apply_voucher()
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 663cba58..3aaae12d 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2871,6 +2871,7 @@ class SaleOrder(models.Model):
     def action_apply_voucher(self):
         for line in self.order_line:
             if line.order_promotion_id:
+                _logger.warning(f"[CHECKOUT FAILED] Produk promo ditemukan: {line.product_id.display_name}")
                 raise UserError('Voucher tidak dapat digabung dengan promotion program')
 
         voucher = self.voucher_id
@@ -2913,42 +2914,82 @@ class SaleOrder(models.Model):
         self.apply_voucher_shipping()
 
     def apply_voucher(self):
+        def _is_promo_line(line):
+            # TRUE jika baris tidak boleh kena voucher
+            if getattr(line, 'order_promotion_id', False):
+                return True  # baris dari program promo
+            if (line.price_unit or 0.0) == 0.0:
+                return True  # free item
+            if getattr(line, 'is_has_disc', False):
+                return True  # sudah promo/flashsale/berdiskon
+            if (line.discount or 0.0) >= 100.0:
+                return True  # safety
+            return False
+
+        # --- LOOP 1: susun input untuk voucher.apply() ---
         order_line = []
         for line in self.order_line:
+            if _is_promo_line(line):
+                continue
             order_line.append({
                 'product_id': line.product_id,
                 'price': line.price_unit,
                 'discount': line.discount,
                 'qty': line.product_uom_qty,
-                'subtotal': line.price_subtotal
+                'subtotal': line.price_subtotal,
             })
+
+        if not order_line:
+            return
+
         voucher = self.voucher_id.apply(order_line)
 
+        # --- LOOP 2: tulis hasilnya HANYA ke non-promo ---
         for line in self.order_line:
+            if _is_promo_line(line):
+                continue
+
             line.initial_discount = line.discount
 
             voucher_type = voucher['type']
-            used_total = voucher['total'][voucher_type]
-            used_discount = voucher['discount'][voucher_type]
+            total_map = voucher['total'][voucher_type]
+            discount_map = voucher['discount'][voucher_type]
 
-            manufacture_id = line.product_id.x_manufacture.id
             if voucher_type == 'brand':
-                used_total = used_total.get(manufacture_id)
-                used_discount = used_discount.get(manufacture_id)
+                m_id = line.product_id.x_manufacture.id
+                used_total = (total_map or {}).get(m_id)
+                used_discount = (discount_map or {}).get(m_id)
+            else:
+                used_total = total_map
+                used_discount = discount_map
 
-            if not used_total or not used_discount:
+            if not used_total or not used_discount or (line.product_uom_qty or 0.0) == 0.0:
                 continue
 
             line_contribution = line.price_subtotal / used_total
             line_voucher = used_discount * line_contribution
-            line_voucher_item = line_voucher / line.product_uom_qty
+            per_item_voucher = line_voucher / line.product_uom_qty
 
-            line_price_unit = line.price_unit / 1.11 if any(tax.id == 23 for tax in line.tax_id) else line.price_unit
-            line_discount_item = line_price_unit * line.discount / 100 + line_voucher_item
-            line_voucher_item = line_discount_item / line_price_unit * 100
+            has_ppn_11 = any(tax.id == 23 for tax in line.tax_id)
+            base_unit = line.price_unit / 1.11 if has_ppn_11 else line.price_unit
+
+            new_disc_value = base_unit * line.discount / 100 + per_item_voucher
+            new_disc_pct = (new_disc_value / base_unit) * 100
 
             line.amount_voucher_disc = line_voucher
-            line.discount = line_voucher_item
+            line.discount = new_disc_pct
+
+            _logger.info(
+                "[VOUCHER_APPLIED] SO=%s voucher=%s type=%s line_id=%s product=%s qty=%s discount_pct=%.2f amount_voucher=%s",
+                self.name,
+                getattr(self.voucher_id, "code", None),
+                voucher.get("type"),
+                line.id,
+                line.product_id.display_name,
+                line.product_uom_qty,
+                line.discount,
+                line.amount_voucher_disc,
+            )
 
         self.amount_voucher_disc = voucher['discount']['all']
         self.applied_voucher_id = self.voucher_id
-- 
cgit v1.2.3


From baaaa901391b4cd6956cb28aff992735e84962e4 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 3 Oct 2025 19:38:57 +0700
Subject: <Miqdad> CR BU/IU Approval flow

---
 indoteknik_custom/models/stock_picking.py | 46 +++++++++++++++++++++++--------
 indoteknik_custom/views/stock_picking.xml | 10 +++++++
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index ae7121da..eea87926 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -176,6 +176,28 @@ class StockPicking(models.Model):
     linked_manual_bu_out = fields.Many2one('stock.picking', string='BU Out', copy=False)
 
     area_name = fields.Char(string="Area", compute="_compute_area_name")
+    is_bu_iu = fields.Boolean('Is BU/IU', compute='_compute_is_bu_iu', default=False, copy=False, readonl=True)
+
+    @api.depends('name')
+    def _compute_is_bu_iu(self):
+        for record in self:
+            if 'BU/IU' in record.name:
+                record.is_bu_iu = True
+            else:
+                record.is_bu_iu = False
+
+    def action_bu_iu_to_pengajuan2(self):
+        for rec in self:
+            if not rec.is_bu_iu or not rec.is_internal_use:
+                raise UserError(_("Tombol ini hanya untuk dokumen BU/IU - Internal Use."))
+            if rec.approval_status == False:
+                raise UserError("Harus Ask Approval terlebih dahulu")
+            if rec.approval_status in ['pengajuan1'] and self.env.user.is_accounting:
+                rec.approval_status = 'pengajuan2'
+                # raise UserError(_("Hanya bisa dijalankan saat status di 'pengajuan1'."))
+                rec.message_post(body=_("Status naik ke Approval Logistik oleh %s") % self.env.user.display_name)
+
+        return True
 
     # def _get_biteship_api_key(self):
     #     # return self.env['ir.config_parameter'].sudo().get_param('biteship.api_key_test')
@@ -1082,9 +1104,12 @@ class StockPicking(models.Model):
 
 
     def ask_approval(self):
-        if self.env.user.is_accounting:
-            raise UserError("Bisa langsung Validate")
-        if self.env.user.is_logistic_approver and self.location_id.id == 57 or self.location_id== 57:
+        # 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:
             raise UserError("Bisa langsung Validate")
 
 
@@ -1110,9 +1135,7 @@ class StockPicking(models.Model):
                 if line.qty_done <= 0:
                     raise UserError("Qty tidak boleh 0")
             pick.approval_status = 'pengajuan1'
-            if pick.location_id.id == 57:
-                pick.approval_status = 'pengajuan2'
-                return
+
 
     def ask_receipt_approval(self):
         if self.env.user.is_logistic_approver:
@@ -1315,10 +1338,10 @@ class StockPicking(models.Model):
         if self.picking_type_id.code == 'incoming' and self.group_id.id == False and self.is_internal_use == False:
             raise UserError(_('Tidak bisa Validate jika tidak dari Document SO / PO'))
 
-        if self.is_internal_use and not self.env.user.is_logistic_approver and self.location_id.id == 57:
+        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 not self.env.user.is_accounting:
+        if self.is_internal_use and not self.env.user.is_accounting and self.approval_status == 'pengajuan1' and self.location_id.id == 57:
             raise UserError("Harus di Approve oleh Accounting")
 
         if self.picking_type_id.id == 28 and not self.env.user.is_logistic_approver:
@@ -1327,8 +1350,10 @@ class StockPicking(models.Model):
         if self.location_dest_id.id == 47 and not self.env.user.is_purchasing_manager:
             raise UserError("Transfer ke gudang selisih harus di approve Rafly Hanggara")
 
-        if self.is_internal_use:
+        if self.is_internal_use and self.approval_status == 'pengajuan2':
             self.approval_status = 'approved'
+        elif self.is_internal_use and self.approval_status in ['pengajuan1', '', False]:
+            raise UserError("Tidak Bisa Validate, set approval status ke approval logistik terlebih dahhulu")
         elif self.picking_type_id.code == 'incoming':
             self.approval_receipt_status = 'approved'
 
@@ -1360,9 +1385,6 @@ class StockPicking(models.Model):
                         )
 
         self.validation_minus_onhand_quantity()
-        loc = self.location_id
-        if loc.id == 57 and not self.env.user.is_logistic_approver and self.approval_status in ['pengajuan2']:
-            raise UserError ("Harus Ask Approval Logistik")
         self.responsible = self.env.user.id
         # self.send_koli_to_so()
         if self.picking_type_code == 'outgoing' and 'BU/OUT/' in self.name:
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 21762202..7f0865f4 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -45,6 +45,14 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
+                <!-- Tambahkan tombol custom: tampil hanya saat BU/IU + pengajuan1 -->
+                <xpath expr="//header" position="inside">
+                    <button name="action_bu_iu_to_pengajuan2"
+                            type="object"
+                            string="Set Ke Approval Logistik"
+                            class="btn-primary"
+                            attrs="{'invisible': [('is_bu_iu', '=', False), ('approval_status', 'in', ['pengajuan2', False, 'false', ''])]}"/>
+                </xpath>
                 <button name="action_confirm" position="before">
                     <button name="ask_approval"
                             string="Ask Approval"
@@ -158,6 +166,8 @@
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
                     <field name="invoice_status"/>
+                    <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"/>
                     <field name="count_line_operation"/>
-- 
cgit v1.2.3


From 63bb46e84f44bdcb286bbca544f65b03a7d98636 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 6 Oct 2025 09:05:59 +0700
Subject: <Miqdad> rollback

---
 indoteknik_custom/models/stock_picking.py | 67 +++++++------------------------
 1 file changed, 14 insertions(+), 53 deletions(-)

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index eea87926..43e45c09 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -176,28 +176,6 @@ class StockPicking(models.Model):
     linked_manual_bu_out = fields.Many2one('stock.picking', string='BU Out', copy=False)
 
     area_name = fields.Char(string="Area", compute="_compute_area_name")
-    is_bu_iu = fields.Boolean('Is BU/IU', compute='_compute_is_bu_iu', default=False, copy=False, readonl=True)
-
-    @api.depends('name')
-    def _compute_is_bu_iu(self):
-        for record in self:
-            if 'BU/IU' in record.name:
-                record.is_bu_iu = True
-            else:
-                record.is_bu_iu = False
-
-    def action_bu_iu_to_pengajuan2(self):
-        for rec in self:
-            if not rec.is_bu_iu or not rec.is_internal_use:
-                raise UserError(_("Tombol ini hanya untuk dokumen BU/IU - Internal Use."))
-            if rec.approval_status == False:
-                raise UserError("Harus Ask Approval terlebih dahulu")
-            if rec.approval_status in ['pengajuan1'] and self.env.user.is_accounting:
-                rec.approval_status = 'pengajuan2'
-                # raise UserError(_("Hanya bisa dijalankan saat status di 'pengajuan1'."))
-                rec.message_post(body=_("Status naik ke Approval Logistik oleh %s") % self.env.user.display_name)
-
-        return True
 
     # def _get_biteship_api_key(self):
     #     # return self.env['ir.config_parameter'].sudo().get_param('biteship.api_key_test')
@@ -213,7 +191,7 @@ class StockPicking(models.Model):
     # def write(self, vals):
     #     if 'linked_manual_bu_out' in vals:
     #         for record in self:
-    #             if (record.picking_type_code == 'internal' 
+    #             if (record.picking_type_code == 'internal'
     #                 and 'BU/PICK/' in record.name):
     #                 # Jika menghapus referensi (nilai di-set False/None)
     #                 if record.linked_manual_bu_out and not vals['linked_manual_bu_out']:
@@ -227,8 +205,8 @@ class StockPicking(models.Model):
     # @api.model
     # def create(self, vals):
     #     record = super().create(vals)
-    #     if (record.picking_type_code == 'internal' 
-    #         and 'BU/PICK/' in record.name 
+    #     if (record.picking_type_code == 'internal'
+    #         and 'BU/PICK/' in record.name
     #         and vals.get('linked_manual_bu_out')):
     #         picking = self.env['stock.picking'].browse(vals['linked_manual_bu_out'])
     #         picking.state_packing = 'packing_done'
@@ -365,7 +343,6 @@ class StockPicking(models.Model):
         except ValueError:
             return False
 
-
     def action_get_kgx_pod(self, shipment=False):
         self.ensure_one()
 
@@ -533,7 +510,7 @@ class StockPicking(models.Model):
     #                 rts_days = rts.days
     #                 rts_hours = divmod(rts.seconds, 3600)
 
-    #                 estimated_by_erts = rts.total_seconds() / 3600  
+    #                 estimated_by_erts = rts.total_seconds() / 3600
 
     #                 record.countdown_ready_to_ship = f"{rts_days} days, {rts_hours} hours"
     #                 record.countdown_hours = estimated_by_erts
@@ -1086,7 +1063,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)
             )
@@ -1102,18 +1080,10 @@ 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_accounting:
             raise UserError("Bisa langsung Validate")
 
-
-
         # for calendar distribute only
         # if self.is_internal_use:
         #     stock_move_lines = self.env['stock.move.line'].search([
@@ -1136,7 +1106,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')
@@ -1338,10 +1307,7 @@ class StockPicking(models.Model):
         if self.picking_type_id.code == 'incoming' and self.group_id.id == False and self.is_internal_use == False:
             raise UserError(_('Tidak bisa Validate jika tidak dari Document SO / PO'))
 
-        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 not self.env.user.is_accounting and self.approval_status == 'pengajuan1' and self.location_id.id == 57:
+        if self.is_internal_use and not self.env.user.is_accounting:
             raise UserError("Harus di Approve oleh Accounting")
 
         if self.picking_type_id.id == 28 and not self.env.user.is_logistic_approver:
@@ -1350,10 +1316,8 @@ class StockPicking(models.Model):
         if self.location_dest_id.id == 47 and not self.env.user.is_purchasing_manager:
             raise UserError("Transfer ke gudang selisih harus di approve Rafly Hanggara")
 
-        if self.is_internal_use and self.approval_status == 'pengajuan2':
+        if self.is_internal_use:
             self.approval_status = 'approved'
-        elif self.is_internal_use and self.approval_status in ['pengajuan1', '', False]:
-            raise UserError("Tidak Bisa Validate, set approval status ke approval logistik terlebih dahhulu")
         elif self.picking_type_id.code == 'incoming':
             self.approval_receipt_status = 'approved'
 
@@ -1369,7 +1333,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:
@@ -1390,14 +1353,14 @@ class StockPicking(models.Model):
         if self.picking_type_code == 'outgoing' and 'BU/OUT/' in self.name:
             self.check_koli()
         res = super(StockPicking, self).button_validate()
-        
+
         # Penambahan link PO di Stock Journal untuk Picking BD
         for picking in self:
             if picking.name and 'BD/' in picking.name and picking.purchase_id:
                 stock_journal = self.env['account.move'].search([
                     ('ref', 'ilike', picking.name + '%'),
-                    ('journal_id', '=', 3) # Stock Journal ID
-                ], limit = 1)
+                    ('journal_id', '=', 3)  # Stock Journal ID
+                ], limit=1)
                 if stock_journal:
                     stock_journal.write({
                         'purchase_order_id': picking.purchase_id.id
@@ -1770,7 +1733,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 = {
@@ -2136,7 +2100,6 @@ class CheckProduct(models.Model):
     _order = 'picking_id, id'
     _inherit = ['barcodes.barcode_events_mixin']
 
-
     picking_id = fields.Many2one(
         'stock.picking',
         string='Picking Reference',
@@ -2589,8 +2552,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)])
 
-- 
cgit v1.2.3


From d3fc7f9dfbd3df9687c9531813ac59c3318c6b43 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 6 Oct 2025 09:08:31 +0700
Subject: <Miqdad> rollback

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

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index ae7121da..0b91e79d 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1080,14 +1080,9 @@ class StockPicking(models.Model):
 
         return res
 
-
     def ask_approval(self):
         if self.env.user.is_accounting:
             raise UserError("Bisa langsung Validate")
-        if self.env.user.is_logistic_approver and self.location_id.id == 57 or self.location_id== 57:
-            raise UserError("Bisa langsung Validate")
-
-
 
         # for calendar distribute only
         # if self.is_internal_use:
@@ -1110,9 +1105,6 @@ class StockPicking(models.Model):
                 if line.qty_done <= 0:
                     raise UserError("Qty tidak boleh 0")
             pick.approval_status = 'pengajuan1'
-            if pick.location_id.id == 57:
-                pick.approval_status = 'pengajuan2'
-                return
 
     def ask_receipt_approval(self):
         if self.env.user.is_logistic_approver:
@@ -1315,9 +1307,6 @@ class StockPicking(models.Model):
         if self.picking_type_id.code == 'incoming' and self.group_id.id == False and self.is_internal_use == False:
             raise UserError(_('Tidak bisa Validate jika tidak dari Document SO / PO'))
 
-        if self.is_internal_use and not self.env.user.is_logistic_approver and self.location_id.id == 57:
-            raise UserError("Harus di Approve oleh Logistik")
-
         if self.is_internal_use and not self.env.user.is_accounting:
             raise UserError("Harus di Approve oleh Accounting")
 
@@ -1344,7 +1333,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:
@@ -1360,22 +1348,19 @@ class StockPicking(models.Model):
                         )
 
         self.validation_minus_onhand_quantity()
-        loc = self.location_id
-        if loc.id == 57 and not self.env.user.is_logistic_approver and self.approval_status in ['pengajuan2']:
-            raise UserError ("Harus Ask Approval Logistik")
         self.responsible = self.env.user.id
         # self.send_koli_to_so()
         if self.picking_type_code == 'outgoing' and 'BU/OUT/' in self.name:
             self.check_koli()
         res = super(StockPicking, self).button_validate()
-        
+
         # Penambahan link PO di Stock Journal untuk Picking BD
         for picking in self:
             if picking.name and 'BD/' in picking.name and picking.purchase_id:
                 stock_journal = self.env['account.move'].search([
                     ('ref', 'ilike', picking.name + '%'),
-                    ('journal_id', '=', 3) # Stock Journal ID
-                ], limit = 1)
+                    ('journal_id', '=', 3)  # Stock Journal ID
+                ], limit=1)
                 if stock_journal:
                     stock_journal.write({
                         'purchase_order_id': picking.purchase_id.id
-- 
cgit v1.2.3


From 4603578f08af74760c323aac624ea2ae95252d4b Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 6 Oct 2025 11:02:40 +0700
Subject: <Miqdad> cr approval BU/IU

---
 indoteknik_custom/models/stock_picking.py | 57 ++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 9 deletions(-)

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 43e45c09..8408cdc4 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -176,6 +176,28 @@ class StockPicking(models.Model):
     linked_manual_bu_out = fields.Many2one('stock.picking', string='BU Out', copy=False)
 
     area_name = fields.Char(string="Area", compute="_compute_area_name")
+    is_bu_iu = fields.Boolean('Is BU/IU', compute='_compute_is_bu_iu', default=False, copy=False, readonl=True)
+
+    @api.depends('name')
+    def _compute_is_bu_iu(self):
+        for record in self:
+            if 'BU/IU' in record.name:
+                record.is_bu_iu = True
+            else:
+                record.is_bu_iu = False
+
+    def action_bu_iu_to_pengajuan2(self):
+        for rec in self:
+            if not rec.is_bu_iu or not rec.is_internal_use:
+                raise UserError(_("Tombol ini hanya untuk dokumen BU/IU - Internal Use."))
+            if rec.approval_status == False:
+                raise UserError("Harus Ask Approval terlebih dahulu")
+            if rec.approval_status in ['pengajuan1'] and self.env.user.is_accounting:
+                rec.approval_status = 'pengajuan2'
+                # raise UserError(_("Hanya bisa dijalankan saat status di 'pengajuan1'."))
+                rec.message_post(body=_("Status naik ke Approval Logistik oleh %s") % self.env.user.display_name)
+
+        return True
 
     # def _get_biteship_api_key(self):
     #     # return self.env['ir.config_parameter'].sudo().get_param('biteship.api_key_test')
@@ -343,6 +365,7 @@ class StockPicking(models.Model):
         except ValueError:
             return False
 
+
     def action_get_kgx_pod(self, shipment=False):
         self.ensure_one()
 
@@ -1063,8 +1086,7 @@ 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)
             )
@@ -1080,10 +1102,18 @@ class StockPicking(models.Model):
 
         return res
 
+
     def ask_approval(self):
-        if self.env.user.is_accounting:
+        # 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:
             raise UserError("Bisa langsung Validate")
 
+
+
         # for calendar distribute only
         # if self.is_internal_use:
         #     stock_move_lines = self.env['stock.move.line'].search([
@@ -1106,6 +1136,7 @@ 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')
@@ -1307,7 +1338,10 @@ class StockPicking(models.Model):
         if self.picking_type_id.code == 'incoming' and self.group_id.id == False and self.is_internal_use == False:
             raise UserError(_('Tidak bisa Validate jika tidak dari Document SO / PO'))
 
-        if self.is_internal_use and not self.env.user.is_accounting:
+        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 not self.env.user.is_accounting and self.approval_status == 'pengajuan1' and self.location_id.id == 57:
             raise UserError("Harus di Approve oleh Accounting")
 
         if self.picking_type_id.id == 28 and not self.env.user.is_logistic_approver:
@@ -1316,8 +1350,10 @@ class StockPicking(models.Model):
         if self.location_dest_id.id == 47 and not self.env.user.is_purchasing_manager:
             raise UserError("Transfer ke gudang selisih harus di approve Rafly Hanggara")
 
-        if self.is_internal_use:
+        if self.is_internal_use and self.approval_status == 'pengajuan2':
             self.approval_status = 'approved'
+        elif self.is_internal_use and self.approval_status in ['pengajuan1', '', False]:
+            raise UserError("Tidak Bisa Validate, set approval status ke approval logistik terlebih dahhulu")
         elif self.picking_type_id.code == 'incoming':
             self.approval_receipt_status = 'approved'
 
@@ -1333,6 +1369,7 @@ 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:
@@ -1359,8 +1396,8 @@ class StockPicking(models.Model):
             if picking.name and 'BD/' in picking.name and picking.purchase_id:
                 stock_journal = self.env['account.move'].search([
                     ('ref', 'ilike', picking.name + '%'),
-                    ('journal_id', '=', 3)  # Stock Journal ID
-                ], limit=1)
+                    ('journal_id', '=', 3) # Stock Journal ID
+                ], limit = 1)
                 if stock_journal:
                     stock_journal.write({
                         'purchase_order_id': picking.purchase_id.id
@@ -1733,8 +1770,7 @@ 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 = {
@@ -2100,6 +2136,7 @@ class CheckProduct(models.Model):
     _order = 'picking_id, id'
     _inherit = ['barcodes.barcode_events_mixin']
 
+
     picking_id = fields.Many2one(
         'stock.picking',
         string='Picking Reference',
@@ -2552,6 +2589,8 @@ 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)])
 
-- 
cgit v1.2.3


From f2f4aa02c6dc2d329fad8d7532297c96a4c5770e Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 6 Oct 2025 12:50:42 +0700
Subject: (andri) fix access export

---
 indoteknik_custom/security/ir.model.access.csv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index ea6670eb..a1adc90a 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -198,7 +198,7 @@ access_tukar_guling_mapping_koli_all_users,tukar.guling.mapping.koli.all.users,m
 access_sync_promise_date_wizard,access.sync.promise.date.wizard,model_sync_promise_date_wizard,base.group_user,1,1,1,1
 access_sync_promise_date_wizard_line,access.sync.promise.date.wizard.line,model_sync_promise_date_wizard_line,base.group_user,1,1,1,1
 access_change_date_planned_wizard,access.change.date.planned.wizard,model_change_date_planned_wizard,,1,1,1,1
-access_unpaid_invoice_view,access.unpaid.invoice.view,model_unpaid_invoice_view,base.group_user,1,1,1,1
-access_surat_piutang_user,surat.piutang user,model_surat_piutang,base.group_user,1,1,1,1
-access_surat_piutang_line_user,surat.piutang.line user,model_surat_piutang_line,base.group_user,1,1,1,1
+access_unpaid_invoice_view,access.unpaid.invoice.view,model_unpaid_invoice_view,,1,1,1,1
+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
-- 
cgit v1.2.3


From 8fe189d8f4caeed4b1aff764abc005b4e4ab3979 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 6 Oct 2025 13:59:19 +0700
Subject: <Miqdad> change button name and fix wrong validation

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

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 8408cdc4..be0d77ac 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1338,11 +1338,11 @@ class StockPicking(models.Model):
         if self.picking_type_id.code == 'incoming' and self.group_id.id == False and self.is_internal_use == False:
             raise UserError(_('Tidak bisa Validate jika tidak dari Document SO / PO'))
 
-        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 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 not self.env.user.is_accounting and self.approval_status == 'pengajuan1' and self.location_id.id == 57:
-            raise UserError("Harus di Approve oleh Accounting")
+        if self.is_internal_use and not self.env.user.is_logistic_approver and self.approval_status in ['pengajuan1', 'pengajuan2'] and self.location_id.id == 57:
+            raise UserError("Harus di Approve oleh Logistik")
 
         if self.picking_type_id.id == 28 and not self.env.user.is_logistic_approver:
             raise UserError("Harus di Approve oleh Logistik")
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 7f0865f4..d943f27a 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -49,7 +49,7 @@
                 <xpath expr="//header" position="inside">
                     <button name="action_bu_iu_to_pengajuan2"
                             type="object"
-                            string="Set Ke Approval Logistik"
+                            string="Approve by Accounting"
                             class="btn-primary"
                             attrs="{'invisible': [('is_bu_iu', '=', False), ('approval_status', 'in', ['pengajuan2', False, 'false', ''])]}"/>
                 </xpath>
-- 
cgit v1.2.3


From f9645a14ad98a901ae66340b87c592f7a0701d01 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 6 Oct 2025 14:09:41 +0700
Subject: <Miqdad> add more vals

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

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index be0d77ac..a9c09ab7 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -194,8 +194,9 @@ class StockPicking(models.Model):
                 raise UserError("Harus Ask Approval terlebih dahulu")
             if rec.approval_status in ['pengajuan1'] and self.env.user.is_accounting:
                 rec.approval_status = 'pengajuan2'
-                # raise UserError(_("Hanya bisa dijalankan saat status di 'pengajuan1'."))
                 rec.message_post(body=_("Status naik ke Approval Logistik oleh %s") % self.env.user.display_name)
+            if rec.approval_status in ['pengajuan1', 'pengajuan2', ''] and not self.env.user.is_accounting:
+                raise UserError("Tombol hanya untuk accounting")
 
         return True
 
-- 
cgit v1.2.3


From 37685c6a3a5b21ee83da1081435525de135f4913 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 6 Oct 2025 17:04:59 +0700
Subject: <Miqdad> set null approval status when from website

---
 indoteknik_api/controllers/api_v1/sale_order.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 25268856..1c87400f 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -727,8 +727,9 @@ class SaleOrder(controller.Controller):
                 _logger.info(f"Updated user_id from partner: {parameters['user_id']}")
 
             if params['value']['type'] == 'sale_order':
-                parameters['approval_status'] = 'pengajuan1'
-                _logger.info("Setting approval_status to 'pengajuan1'")
+                # parameters['approval_status'] = 'pengajuan1'
+                parameters['approval_status'] = False
+                _logger.info("Setting approval_status to 'false'")
 
             sale_order = request.env['sale.order'].with_context(from_website_checkout=True).create([parameters])
             sale_order.onchange_partner_contact()
-- 
cgit v1.2.3


From 3c7176c6d87c4a1385e5a87e119878b6e9a5d88f Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 7 Oct 2025 15:08:17 +0700
Subject: <Miqdad> add more vals IU approval

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

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index a2bd7339..51b6276c 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1340,11 +1340,14 @@ class StockPicking(models.Model):
             raise UserError(_('Tidak bisa Validate jika tidak dari Document SO / PO'))
 
         # 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")
+        #     raise UserError("Harus di Approve oleh Logistik")
 
-        if self.is_internal_use and not self.env.user.is_logistic_approver and self.approval_status in ['pengajuan1', 'pengajuan2'] and self.location_id.id == 57:
+        if self.is_internal_use and not self.env.user.is_logistic_approver and self.approval_status in ['pengajuan1', 'pengajuan2'] and self.location_id.id == 57 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:
+            raise UserError("Harus di Approve oleh Accounting")
+
         if self.picking_type_id.id == 28 and not self.env.user.is_logistic_approver:
             raise UserError("Harus di Approve oleh Logistik")
 
@@ -1353,7 +1356,7 @@ class StockPicking(models.Model):
 
         if self.is_internal_use and self.approval_status == 'pengajuan2':
             self.approval_status = 'approved'
-        elif self.is_internal_use and self.approval_status in ['pengajuan1', '', False]:
+        elif 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")
         elif self.picking_type_id.code == 'incoming':
             self.approval_receipt_status = 'approved'
-- 
cgit v1.2.3


From 92d28be458ca53c9994a175225232b24c7fde283 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 7 Oct 2025 15:20:29 +0700
Subject: <Miqdad> fix approval IU

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

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 51b6276c..4772c433 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1342,7 +1342,10 @@ 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 not self.env.user.is_logistic_approver and self.approval_status in ['pengajuan1', 'pengajuan2'] and self.location_id.id == 57 and self.is_bu_iu == True and 'BU/IU' in self.name:
+        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:
             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:
@@ -1356,8 +1359,6 @@ class StockPicking(models.Model):
 
         if self.is_internal_use and self.approval_status == 'pengajuan2':
             self.approval_status = 'approved'
-        elif 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")
         elif self.picking_type_id.code == 'incoming':
             self.approval_receipt_status = 'approved'
 
-- 
cgit v1.2.3


From 07ae0b7f2eab52daf5e33dc47450189537be2e1c Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 7 Oct 2025 18:20:53 +0700
Subject: (andri) email cc surat piutang

---
 indoteknik_custom/models/letter_receivable.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/indoteknik_custom/models/letter_receivable.py b/indoteknik_custom/models/letter_receivable.py
index ffe14491..821825d6 100644
--- a/indoteknik_custom/models/letter_receivable.py
+++ b/indoteknik_custom/models/letter_receivable.py
@@ -193,11 +193,11 @@ class SuratPiutang(models.Model):
                 line.amount_residual or 0.0 for line in rec.line_ids if line.selected
             )
 
-    @api.constrains("tujuan_email")
-    def _check_email_format(self):
-        for rec in self:
-            if rec.tujuan_email and not mail.single_email_re.match(rec.tujuan_email):
-                raise ValidationError(_("Format email tidak valid: %s") % rec.tujuan_email)
+    # @api.constrains("tujuan_email")
+    # def _check_email_format(self):
+    #     for rec in self:
+    #         if rec.tujuan_email and not mail.single_email_re.match(rec.tujuan_email):
+    #             raise ValidationError(_("Format email tidak valid: %s") % rec.tujuan_email)
 
     def action_approve(self):
         wib = pytz.timezone('Asia/Jakarta')
@@ -363,6 +363,7 @@ class SuratPiutang(models.Model):
             'email_to': self.tujuan_email,
             'email_from': 'finance@indoteknik.co.id',
             # 'email_cc': ",".join(sorted(set(cc_list))),
+            'email_cc': 'finance@indoteknik.co.id',
             'body_html': body_html, # Menggunakan body_html yang sudah ditentukan di atas
             'attachments': [(attachment.name, attachment.datas)],
             # 'reply_to': 'finance@indoteknik.co.id',
-- 
cgit v1.2.3


From ec5053921c0e858a4c33fb2cddf1152600831f7a Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 7 Oct 2025 18:25:04 +0700
Subject: (andri) fix

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

diff --git a/indoteknik_custom/models/letter_receivable.py b/indoteknik_custom/models/letter_receivable.py
index 821825d6..f75af92e 100644
--- a/indoteknik_custom/models/letter_receivable.py
+++ b/indoteknik_custom/models/letter_receivable.py
@@ -362,11 +362,11 @@ class SuratPiutang(models.Model):
             'subject': subject, # Menggunakan subject yang sudah ditentukan di atas
             'email_to': self.tujuan_email,
             'email_from': 'finance@indoteknik.co.id',
-            # 'email_cc': ",".join(sorted(set(cc_list))),
+            'email_cc': ",".join(sorted(set(cc_list))),
             'email_cc': 'finance@indoteknik.co.id',
             'body_html': body_html, # Menggunakan body_html yang sudah ditentukan di atas
             'attachments': [(attachment.name, attachment.datas)],
-            # 'reply_to': 'finance@indoteknik.co.id',
+            'reply_to': 'finance@indoteknik.co.id',
         }
 
         template.with_context(mail_post_autofollow=False).send_mail(
-- 
cgit v1.2.3


From 776bc2d9f132050ceed95ef2a96eb1dcf8ad1c44 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 7 Oct 2025 18:44:12 +0700
Subject: (andri) add button select & unselect all

---
 indoteknik_custom/models/letter_receivable.py | 12 ++++++++++++
 indoteknik_custom/views/letter_receivable.xml | 16 ++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/letter_receivable.py b/indoteknik_custom/models/letter_receivable.py
index f75af92e..370e0909 100644
--- a/indoteknik_custom/models/letter_receivable.py
+++ b/indoteknik_custom/models/letter_receivable.py
@@ -69,6 +69,18 @@ class SuratPiutang(models.Model):
         "sp1": "sp2",
         "sp2": "sp3",
     }
+
+    def action_select_all_lines(self):
+        for rec in self:
+            if not rec.line_ids:
+                raise UserError(_("Tidak ada invoice line untuk dipilih."))
+            rec.line_ids.write({'selected': True})
+
+    def action_unselect_all_lines(self):
+        for rec in self:
+            if not rec.line_ids:
+                raise UserError(_("Tidak ada invoice line untuk dihapus seleksinya."))
+            rec.line_ids.write({'selected': False})
     
     @api.onchange('partner_id')
     def _onchange_partner_id_domain(self):
diff --git a/indoteknik_custom/views/letter_receivable.xml b/indoteknik_custom/views/letter_receivable.xml
index 98186862..3241d5f1 100644
--- a/indoteknik_custom/views/letter_receivable.xml
+++ b/indoteknik_custom/views/letter_receivable.xml
@@ -128,11 +128,23 @@
                                     </div>
                                 </div>
                                 <div>
+                                    <button name="action_select_all_lines"
+                                            type="object"
+                                            string="Select All"
+                                            class="btn btn-secondary"
+                                            icon="fa-check-square"/>
+                                    <button name="action_unselect_all_lines"
+                                            type="object"
+                                            string="Unselect All"
+                                            class="btn btn-secondary"
+                                            icon="fa-square-o"
+                                            style="margin-left:5px;"/>
                                     <button name="action_refresh_lines"
                                             string="Refresh Invoices"
                                             type="object"
-                                            class="btn-primary"
-                                            style="margin-left:10px;"
+                                            class="btn btn-secondary"
+                                            icon="fa-refresh"
+                                            style="margin-left:5px;"
                                             help="Refresh Invoices agar data tetap update"/>
                                 </div>
                             </div>
-- 
cgit v1.2.3


From 861879ce8479b22bd340eaa3835c8682810866dd Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 7 Oct 2025 18:53:24 +0700
Subject: (andri) fix

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

diff --git a/indoteknik_custom/models/letter_receivable.py b/indoteknik_custom/models/letter_receivable.py
index 370e0909..f9f65b65 100644
--- a/indoteknik_custom/models/letter_receivable.py
+++ b/indoteknik_custom/models/letter_receivable.py
@@ -375,7 +375,7 @@ class SuratPiutang(models.Model):
             'email_to': self.tujuan_email,
             'email_from': 'finance@indoteknik.co.id',
             'email_cc': ",".join(sorted(set(cc_list))),
-            'email_cc': 'finance@indoteknik.co.id',
+            # 'email_cc': 'finance@indoteknik.co.id', # testing
             'body_html': body_html, # Menggunakan body_html yang sudah ditentukan di atas
             'attachments': [(attachment.name, attachment.datas)],
             'reply_to': 'finance@indoteknik.co.id',
-- 
cgit v1.2.3


From adafea307399d897df586fe13029c92efcdb8e80 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 7 Oct 2025 19:48:39 +0700
Subject: <Miqdad> multiple chat bubble SJ Tele

---
 indoteknik_custom/models/sj_tele.py | 73 +++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 40 deletions(-)

diff --git a/indoteknik_custom/models/sj_tele.py b/indoteknik_custom/models/sj_tele.py
index d44aa338..5ea08340 100644
--- a/indoteknik_custom/models/sj_tele.py
+++ b/indoteknik_custom/models/sj_tele.py
@@ -19,41 +19,18 @@ class SjTele(models.Model):
     create_date = fields.Datetime(string='Create Date')
     date_doc_kirim = fields.Datetime(string='Tanggal Kirim SJ')
 
-    # @api.model
-    # def run_pentaho_carte(self):
-    #     carte = "http://127.0.0.1:8080"
-    #     job_kjb = r"C:/Users/Indoteknik/Desktop/tes.kjb"
-    #     params = {"job": job_kjb, "level": "Basic", "block": "Y"}
-    #     try:
-    #         r = requests.get(
-    #             f"{carte}/kettle/executeJob/",
-    #             params=params,
-    #             auth=("cluster", "cluster"),
-    #             timeout=900,
-    #         )
-    #         r.raise_for_status()
-    #         # kalau Carte mengembalikan <result>ERROR</result>, anggap gagal
-    #         if "<result>ERROR</result>" in r.text:
-    #             raise UserError(f"Carte error: {r.text}")
-    #     except Exception as e:
-    #         _logger.exception("Carte call failed: %s", e)
-    #         raise UserError(f"Gagal memanggil Carte: {e}")
-        
-    #     time.sleep(3)
-
-    #     self.env['sj.tele'].sudo().woi()
-
-    #     return True
-
     def woi(self):
         bot_mqdd = '8203414501:AAHy_XwiUAVrgRM2EJzW7sZx9npRLITZpb8'
         chat_id_mqdd = '-1003087280519'
         api_base = f'https://api.telegram.org/bot{bot_mqdd}'
+        # bot_testing = '8306689189:AAHEFe5xwAkapoQ8xKoNZs-6gVfv3kO3kaU'
+        # chat_id_testing = '-4920864331'
+        # api_testing = f'https://api.telegram.org/bot{bot_testing}'
 
-        data = self.search([], order='create_date asc', limit=15)
+        data = self.search([], order='create_date asc')
 
         if not data:
-            text = "Berikut merupakan nomor BU/OUT yang belum ada di Logbook SJ report:\n✅ tidak ada data (semua sudah tercatat)."
+            text = "✅ tidak ada data (semua sudah tercatat)."
             try:
                 r = requests.post(api_base + "/sendMessage",
                                   json={'chat_id': chat_id_mqdd, 'text': text},
@@ -74,7 +51,6 @@ class SjTele(models.Model):
             dttm = (rec.picking_id.date_doc_kirim if (rec.picking_id and rec.picking_id.date_doc_kirim)
                     else getattr(rec, 'date_doc_kirim', None))
 
-            # format header tanggal (string), tanpa konversi Waktu/WIB
             if dttm:
                 date_header = dttm if isinstance(dttm, str) else fields.Datetime.to_string(dttm)
                 date_header = date_header[:10]
@@ -84,19 +60,36 @@ class SjTele(models.Model):
             if name:
                 groups.setdefault(date_header, []).append(f"- ({pid}) - {name} - {so}")
 
-        # build output berurutan per tanggal
         for header_date, items in groups.items():
             lines.append(header_date)
             lines.extend(items)
 
-
         header = "Berikut merupakan nomor BU/OUT yang belum ada di Logbook SJ report:\n"
-        text = header + "\n".join(lines)
-
-        try:
-            r = requests.post(api_base + "/sendMessage",
-                              json={'chat_id': chat_id_mqdd, 'text': text})
-            r.raise_for_status()
-        except Exception as e:
-            _logger.exception("Gagal kirim Telegram: %s", e)
-        return True
\ No newline at end of file
+        BUB = 20  # jumlah baris per bubble
+
+        for i in range(0, len(lines), BUB):
+            body = "\n".join(lines[i:i + BUB])
+            text = header + body
+            try:
+                r = requests.post(
+                    api_base + "/sendMessage",
+                    json={'chat_id': chat_id_mqdd, 'text': text},
+                    timeout=20
+                )
+                r.raise_for_status()
+            except Exception as e:
+                _logger.exception("Gagal kirim Telegram (batch %s-%s): %s", i + 1, min(i + BUB, len(lines)), e)
+            time.sleep(5)  # jeda kecil biar rapi & aman rate limit
+
+        return True
+
+        # header = "Berikut merupakan nomor BU/OUT yang belum ada di Logbook SJ report:\n"
+        # text = header + "\n".join(lines)
+        #
+        # try:
+        #     r = requests.post(api_base + "/sendMessage",
+        #                       json={'chat_id': chat_id_mqdd, 'text': text})
+        #     r.raise_for_status()
+        # except Exception as e:
+        #     _logger.exception("Gagal kirim Telegram: %s", e)
+        # return True
\ No newline at end of file
-- 
cgit v1.2.3


From d72c8fb9cd97552ef15aee0b70f7e1248b4c4696 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 8 Oct 2025 10:00:56 +0700
Subject: <Miqdad> constrain delivery departure date to denise and faishal

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

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 4772c433..217e76cb 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -178,6 +178,14 @@ class StockPicking(models.Model):
     area_name = fields.Char(string="Area", compute="_compute_area_name")
     is_bu_iu = fields.Boolean('Is BU/IU', compute='_compute_is_bu_iu', default=False, copy=False, readonl=True)
 
+    @api.constrains('driver_departure_date')
+    def _constrains_driver_departure_date(self):
+        allowed_user_ids = [17, 6277, 25]
+        for record in self:
+            if record.driver_departure_date and self.env.user.id not in allowed_user_ids:
+                raise UserError("Hanya Denise dan Faishal yang dapat mengubah Delivery Departure Date.")
+
+
     @api.depends('name')
     def _compute_is_bu_iu(self):
         for record in self:
-- 
cgit v1.2.3


From 51155d702da715c82ea55322ee049d9b1ee34faa Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Wed, 8 Oct 2025 11:43:57 +0700
Subject: (andri) fix approval

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

diff --git a/indoteknik_custom/models/letter_receivable.py b/indoteknik_custom/models/letter_receivable.py
index f9f65b65..a98e46a1 100644
--- a/indoteknik_custom/models/letter_receivable.py
+++ b/indoteknik_custom/models/letter_receivable.py
@@ -215,7 +215,7 @@ class SuratPiutang(models.Model):
         wib = pytz.timezone('Asia/Jakarta')
         now_wib = datetime.now(wib)
 
-        sales_manager_ids = [10]  # ganti dengan ID user Sales Manager
+        sales_manager_ids = [19]  # ganti dengan ID user Sales Manager
         pimpinan_user_ids = [7]   # ganti dengan ID user Pimpinan
 
         for rec in self:
-- 
cgit v1.2.3


From 17cd1c4b3a5e685498d16e6d1af1bb990ec543e8 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 8 Oct 2025 14:48:49 +0700
Subject: <Miqdad> remove approval status validation for bayar sekarang

---
 indoteknik_api/controllers/api_v1/sale_order.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 1c87400f..5d6a4117 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -231,11 +231,10 @@ class SaleOrder(controller.Controller):
         for so in filtered_orders_paginated:
             item = request.env['sale.order'].api_v1_single_response(so)
 
-            approval_ok = (so.approval_status in ('pengajuan1', 'pengajuan2'))
             source_ok = _is_website_order(so)
             term_ok = bool(so.payment_term_id and so.payment_term_id.id == CBD_PAYMENT_TERM_ID)
             pay_status = (getattr(so, 'payment_status', '') or '').strip().lower()
-            eligible = bool(approval_ok and source_ok and term_ok and pay_status in ALLOWED_CONTINUE)
+            eligible = bool(source_ok and term_ok and pay_status in ALLOWED_CONTINUE)
 
             redirect_url = getattr(so, 'payment_link_midtrans', '') or ''
 
@@ -285,7 +284,6 @@ class SaleOrder(controller.Controller):
 
             pay_status = (getattr(sale_order, 'payment_status', '') or '').strip().lower()
             eligible = (
-                    sale_order.approval_status in ('pengajuan1', 'pengajuan2') and
                     _is_website_order(sale_order) and
                     sale_order.payment_term_id and sale_order.payment_term_id.id == CBD_PAYMENT_TERM_ID and
                     pay_status in ALLOWED_CONTINUE
-- 
cgit v1.2.3


From c5642f4f6c4f0969475d863bee7243a83b9290dc Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 8 Oct 2025 14:55:04 +0700
Subject: partial

---
 indoteknik_custom/__manifest__.py              |   1 +
 indoteknik_custom/models/__init__.py           |   2 +
 indoteknik_custom/models/automatic_purchase.py | 161 +++++++++++----------
 indoteknik_custom/models/domain_apo.py         |  12 ++
 indoteknik_custom/models/partial_delivery.py   | 189 +++++++++++++++++++++++++
 indoteknik_custom/models/sale_order.py         |  13 +-
 indoteknik_custom/models/stock_move.py         |   1 +
 indoteknik_custom/security/ir.model.access.csv |   3 +
 indoteknik_custom/views/domain_apo.xml         |  46 ++++++
 indoteknik_custom/views/sale_order.xml         |  48 ++++++-
 indoteknik_custom/views/stock_picking.xml      |   1 +
 11 files changed, 394 insertions(+), 83 deletions(-)
 create mode 100644 indoteknik_custom/models/domain_apo.py
 create mode 100644 indoteknik_custom/models/partial_delivery.py
 create mode 100644 indoteknik_custom/views/domain_apo.xml

diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py
index b083be70..d1229ffe 100755
--- a/indoteknik_custom/__manifest__.py
+++ b/indoteknik_custom/__manifest__.py
@@ -186,6 +186,7 @@
         # 'views/reimburse.xml',
         'views/sj_tele.xml',
         'views/close_tempo_mail_template.xml',
+        'views/domain_apo.xml',
     ],
     'demo': [],
     'css': [],
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index 6dc61277..5ac4d6ca 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -160,3 +160,5 @@ from . import update_date_planned_po_wizard
 from . import unpaid_invoice_view
 from . import letter_receivable
 from . import sj_tele
+from . import partial_delivery
+from . import domain_apo
diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py
index 83a7cb3c..d9ec17f4 100644
--- a/indoteknik_custom/models/automatic_purchase.py
+++ b/indoteknik_custom/models/automatic_purchase.py
@@ -93,7 +93,7 @@ class AutomaticPurchase(models.Model):
 
         counter = 0
         for vendor in vendor_ids:
-            self.create_po_by_vendor(vendor['partner_id'][0])
+            self.create_po_for_vendor(vendor['partner_id'][0])
             
             # param_header = {
             #     'partner_id': vendor['partner_id'][0],
@@ -191,95 +191,106 @@ class AutomaticPurchase(models.Model):
                 if qty_pj > qty_outgoing_pj:
                     raise UserError('Qty yang anda beli lebih dari qty outgoing. %s' %id_po)
                 
-    def create_po_by_vendor(self, vendor_id):
+    def create_po_for_vendor(self, vendor_id):
         current_time = datetime.now()
         name = "/PJ/" if not self.apo_type == 'reordering' else "/A/"
-
         PRODUCT_PER_PO = 20
         auto_purchase_line = self.env['automatic.purchase.line']
 
-        # Domain untuk semua baris dengan vendor_id tertentu
-        domain = [
+        config = self.env['apo.domain.config'].search([
+            ('vendor_id', '=', vendor_id)
+        ], limit=1)
+
+        base_domain = [
             ('automatic_purchase_id', '=', self.id),
             ('partner_id', '=', vendor_id),
             ('qty_purchase', '>', 0)
         ]
 
-        # Tambahkan domain khusus untuk brand_id 22 dan 564
-        special_brand_domain = domain + [('brand_id', 'in', [22, 564])]
-        regular_domain = domain + [('brand_id', 'not in', [22, 564])]
-
-        # Fungsi untuk membuat PO berdasarkan domain tertentu
-        def create_po_for_domain(domain, special_payment_term=False):
-            products_len = auto_purchase_line.search_count(domain)
-            page = math.ceil(products_len / PRODUCT_PER_PO)
-
-            for i in range(page):
-                # Buat PO baru
-                param_header = {
-                    'partner_id': vendor_id,
-                    'currency_id': 12,
-                    'user_id': self.env.user.id,
-                    'company_id': 1,  # indoteknik dotcom gemilang
-                    'picking_type_id': 28,  # indoteknik bandengan receipts
-                    'date_order': current_time,
-                    'from_apo': True,
-                    'note_description': 'Automatic PO'
-                }
+        # Kalau vendor punya brand spesial → bikin domain sesuai config
+        if config and config.is_special:
+            special_brand_domain = base_domain + [('brand_id', 'in', config.brand_ids.ids)]
+            self._create_po_for_domain(
+                vendor_id, special_brand_domain, name, PRODUCT_PER_PO, current_time, config.payment_term_id, special=config.is_special
+            )
 
-                new_po = self.env['purchase.order'].create([param_header])
+        # Regular domain (selain brand spesial)
+        regular_domain = base_domain
+        if config and config.is_special and config.brand_ids:
+            regular_domain = base_domain + [('brand_id', 'not in', config.brand_ids.ids)]
 
-                # Set payment_term_id khusus jika diperlukan
-                if special_payment_term:
-                    new_po.payment_term_id = 29
-                else:
-                    new_po.payment_term_id = new_po.partner_id.property_supplier_payment_term_id
+        self._create_po_for_domain(
+            vendor_id, regular_domain, name, PRODUCT_PER_PO, current_time, config.payment_term_id
+        )
 
-                new_po.name = new_po.name + name + str(i + 1)
 
-                self.env['automatic.purchase.match'].create([{
-                    'automatic_purchase_id': self.id,
-                    'order_id': new_po.id
-                }])
+    def _create_po_for_domain(self, vendor_id, domain, name, PRODUCT_PER_PO, current_time, payment_term_id, special=False):
+        auto_purchase_line = self.env['automatic.purchase.line']
+        products_len = auto_purchase_line.search_count(domain)
+        page = math.ceil(products_len / PRODUCT_PER_PO)
+
+        for i in range(page):
+            # Buat header PO
+            param_header = {
+                'partner_id': vendor_id,
+                'currency_id': 12,
+                'user_id': self.env.user.id,
+                'company_id': 1,
+                'picking_type_id': 28,
+                'date_order': current_time,
+                'from_apo': True,
+                'note_description': 'Automatic PO'
+            }
+            new_po = self.env['purchase.order'].create(param_header)
+
+            # Set payment term
+            new_po.payment_term_id = payment_term_id.id if special else (
+                new_po.partner_id.property_supplier_payment_term_id
+            )
+
+            new_po.name = new_po.name + name + str(i + 1)
+
+            self.env['automatic.purchase.match'].create([{
+                'automatic_purchase_id': self.id,
+                'order_id': new_po.id
+            }])
+
+            # Ambil lines
+            lines = auto_purchase_line.search(
+                domain,
+                offset=i * PRODUCT_PER_PO,
+                limit=PRODUCT_PER_PO
+            )
+
+            # Pre-fetch sales_match biar ga search per line
+            sales_matches = self.env['automatic.purchase.sales.match'].search([
+                ('automatic_purchase_id', '=', self.id),
+                ('product_id', 'in', lines.mapped('product_id').ids),
+            ])
+            match_map = {sm.product_id.id: sm for sm in sales_matches}
+
+            for line in lines:
+                product = line.product_id
+                sales_match = match_map.get(product.id)
+                param_line = {
+                    'order_id': new_po.id,
+                    'product_id': product.id,
+                    'product_qty': line.qty_purchase,
+                    'qty_available_store': product.qty_available_bandengan,
+                    'suggest': product._get_po_suggest(line.qty_purchase),
+                    'product_uom_qty': line.qty_purchase,
+                    'price_unit': line.last_price,
+                    '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
+                }
+                new_po_line = self.env['purchase.order.line'].create(param_line)
+                line.current_po_id = new_po.id
+                line.current_po_line_id = new_po_line.id
+
+            self.create_purchase_order_sales_match(new_po)
 
-                # Ambil baris sesuai halaman
-                lines = auto_purchase_line.search(
-                    domain,
-                    offset=i * PRODUCT_PER_PO,
-                    limit=PRODUCT_PER_PO
-                )
-
-                for line in lines:
-                    product = line.product_id
-                    sales_match = self.env['automatic.purchase.sales.match'].search([
-                        ('automatic_purchase_id', '=', self.id),
-                        ('product_id', '=', product.id),
-                    ])
-                    param_line = {
-                        'order_id': new_po.id,
-                        'product_id': product.id,
-                        'product_qty': line.qty_purchase,
-                        'qty_available_store': product.qty_available_bandengan,
-                        'suggest': product._get_po_suggest(line.qty_purchase),
-                        'product_uom_qty': line.qty_purchase,
-                        'price_unit': line.last_price,
-                        'ending_price': line.last_price,
-                        'taxes_id': [line.taxes_id.id] if line.taxes_id else None,
-                        'so_line_id': sales_match[0].sale_line_id.id if sales_match else None,
-                        'so_id': sales_match[0].sale_id.id if sales_match else None
-                    }
-                    new_po_line = self.env['purchase.order.line'].create([param_line])
-                    line.current_po_id = new_po.id
-                    line.current_po_line_id = new_po_line.id
-
-                self.create_purchase_order_sales_match(new_po)
-
-        # Buat PO untuk special brand
-        if vendor_id == 23:
-            create_po_for_domain(special_brand_domain,  special_payment_term=True)
-
-        # Buat PO untuk regular domain
-        create_po_for_domain(regular_domain, "")
 
 
     def update_purchase_price_so_line(self, apo):
diff --git a/indoteknik_custom/models/domain_apo.py b/indoteknik_custom/models/domain_apo.py
new file mode 100644
index 00000000..585dd24c
--- /dev/null
+++ b/indoteknik_custom/models/domain_apo.py
@@ -0,0 +1,12 @@
+from odoo import models, fields
+
+
+class ApoDomainConfig(models.Model):
+    _name = 'apo.domain.config'
+    _description = 'Automatic Purchase Domain Config'
+
+    name = fields.Char(string="Config Name", required=True)
+    vendor_id = fields.Many2one('res.partner', string="Vendor", required=True, domain=[('supplier_rank', '>', 0)])
+    brand_ids = fields.Many2many('x_manufactures', string="Special Brands")
+    payment_term_id = fields.Many2one('account.payment.term', string="Payment Term")
+    is_special = fields.Boolean(string="Special Vendor?", default=False)
diff --git a/indoteknik_custom/models/partial_delivery.py b/indoteknik_custom/models/partial_delivery.py
new file mode 100644
index 00000000..c9d2ba5c
--- /dev/null
+++ b/indoteknik_custom/models/partial_delivery.py
@@ -0,0 +1,189 @@
+from odoo import fields, models, api, _
+from odoo.exceptions import UserError, ValidationError
+from datetime import datetime, timedelta, timezone, time
+import logging, random, string, requests, math, json, re, qrcode, base64
+
+_logger = logging.getLogger(__name__)
+
+class PartialDeliveryWizard(models.TransientModel):
+    _name = 'partial.delivery.wizard'
+    _description = 'Partial Delivery Wizard'
+
+    sale_id = fields.Many2one('sale.order')
+    picking_ids = fields.Many2many('stock.picking')
+    picking_id = fields.Many2one(
+        'stock.picking',
+        string='Delivery Order',
+        domain="[('id','in',picking_ids), ('state', 'not in', ('done', 'cancel')), ('name', 'like', 'BU/PICK/%')]"
+    )
+    line_ids = fields.One2many('partial.delivery.wizard.line', 'wizard_id')
+
+    # @api.model
+    # def default_get(self, fields_list):
+    #     res = super().default_get(fields_list)
+    #     picking_ids_ctx = self.env.context.get('default_picking_ids')
+    #     lines = []
+    #     if picking_ids_ctx:
+    #         if isinstance(picking_ids_ctx, list) and picking_ids_ctx and isinstance(picking_ids_ctx[0], tuple):
+    #             picking_ids = picking_ids_ctx[0][2]
+    #         else:
+    #             picking_ids = picking_ids_ctx
+
+    #         pickings = self.env['stock.picking'].browse(picking_ids)
+    #         moves = pickings.move_ids_without_package.filtered(lambda m: m.reserved_availability > 0)
+
+    #         for move in moves:
+    #             lines.append((0, 0, {
+    #                 'product_id': move.product_id.id,
+    #                 'reserved_qty': move.reserved_availability,
+    #                 'move_id': move.id,
+    #             }))
+    #     res['line_ids'] = lines
+    #     return res
+
+    @api.onchange('picking_id')
+    def _onchange_picking_id(self):
+        """Generate lines whenever picking_id is changed"""
+        lines = []
+        if self.picking_id:
+            moves = self.picking_id.move_ids_without_package.filtered(lambda m: m.reserved_availability > 0)
+            for move in moves:
+                lines.append((0, 0, {
+                    'product_id': move.product_id.id,
+                    'reserved_qty': move.reserved_availability,
+                    'move_id': move.id,
+                }))
+        self.line_ids = lines
+
+
+    def action_confirm_partial_delivery(self):
+        self.ensure_one()
+        StockPicking = self.env['stock.picking']
+
+        picking = self.picking_id
+        if not picking:
+            raise UserError(_("Tidak ada picking yang dipilih."))
+
+        if picking.state != "assigned":
+            raise UserError(_("Picking harus dalam status Ready (assigned)."))
+        
+
+        lines_by_qty = self.line_ids.filtered(lambda l: l.selected_qty > 0)
+        lines_by_selected = self.line_ids.filtered(lambda l: l.selected and not l.selected_qty)
+        selected_lines = lines_by_qty | lines_by_selected  # gabung dua domain hasil filter
+
+        if not selected_lines:
+            raise UserError(_("Tidak ada produk yang dipilih atau diisi jumlahnya."))
+        
+        if selected_lines.selected_qty > selected_lines.reserved_qty:
+            raise UserError(_("Jumlah produk yang dipilih melebihi jumlah reserved."))
+
+        new_picking = StockPicking.create({
+            'origin': picking.origin,
+            'partner_id': picking.partner_id.id,
+            'picking_type_id': picking.picking_type_id.id,
+            'location_id': picking.location_id.id,
+            'location_dest_id': picking.location_dest_id.id,
+            'company_id': picking.company_id.id,
+            'state_reserve': 'partial',
+        })
+
+        for line in selected_lines:
+            move = line.move_id
+            move._do_unreserve()
+
+            # kalau cuma selected tanpa isi qty, otomatis set selected_qty = reserved_qty
+            if line.selected and not line.selected_qty:
+                line.selected_qty = line.reserved_qty
+
+            # MODE 1 → Prioritas kalau ada selected_qty
+            if line.selected_qty > 0:
+                if line.selected_qty > move.product_uom_qty:
+                    raise UserError(_(
+                        f"Qty kirim ({line.selected_qty}) untuk {move.product_id.display_name} melebihi qty move ({move.product_uom_qty})."
+                    ))
+
+                if line.selected_qty < move.product_uom_qty:
+                    qty_to_keep = move.product_uom_qty - line.selected_qty
+                    # split move
+                    new_move = move.copy(default={
+                        'product_uom_qty': line.selected_qty,
+                        'picking_id': new_picking.id,
+                        'partial': True,
+                    })
+                    move.write({'product_uom_qty': qty_to_keep})
+                else:
+                    # full pindah
+                    move.write({'picking_id': new_picking.id, 'partial': True})
+
+
+
+        # Confirm & assign DO baru
+        new_picking.action_confirm()
+        new_picking.action_assign()
+
+        # Reassign DO lama biar sisa qty ke-update
+        picking.action_assign()
+
+        # --- 🔢 Rename picking baru dengan format "/(Nomor urut)" ---
+        existing_partials = self.env['stock.picking'].search([
+            ('origin', '=', picking.origin),
+            ('state_reserve', '=', 'partial'),
+            ('id', '!=', new_picking.id),
+        ], order='name asc')
+
+        suffix_number = len(existing_partials)
+        if suffix_number == 0:
+            suffix_number = 1
+        else:
+            suffix_number += 1
+
+        new_name = f"{picking.name}/{suffix_number}"
+        new_picking.name = new_name
+
+        # --- 💬 Post message ke SO ---
+        if picking.origin:
+            sale_order = self.env['sale.order'].search([('name', '=', picking.origin)], limit=1)
+            if sale_order:
+                sale_order.message_post(
+                    body=f"<b>Partial Delivery Created:</b> <a href=# data-oe-model='stock.picking' data-oe-id='{new_picking.id}'>{new_picking.name}</a> "
+                        f"oleh {self.env.user.name}",
+                    message_type="comment",
+                    subtype_xmlid="mail.mt_note",
+                )
+
+        # --- 📝 Log di DO baru ---
+        new_picking.message_post(
+            body=f"<b>Partial Picking created</b> dari {picking.name} oleh {self.env.user.name}",
+            message_type="comment",
+            subtype_xmlid="mail.mt_note",
+        )
+
+        return {
+            "type": "ir.actions.act_window",
+            "res_model": "stock.picking",
+            "view_mode": "form",
+            "res_id": new_picking.id,
+            "target": "current",
+            "effect": {
+                "fadeout": "slow",
+                "message": f"🚚 Partial Delivery {new_picking.name} berhasil dibuat!",
+                "type": "rainbow_man",
+            },
+        }
+
+
+
+class PartialDeliveryWizardLine(models.TransientModel):
+    _name = 'partial.delivery.wizard.line'
+    _description = 'Partial Delivery Wizard Line'
+
+    wizard_id = fields.Many2one('partial.delivery.wizard')
+    product_id = fields.Many2one('product.product', string="Product")
+    reserved_qty = fields.Float(string="Reserved Qty")
+    selected_qty = fields.Float(string="Send Qty")
+    move_id = fields.Many2one('stock.move')
+    selected = fields.Boolean(string="Select")
+    sale_line_id = fields.Many2one('sale.order.line', string="SO Line", related='move_id.sale_line_id')
+    ordered_qty = fields.Float(related='sale_line_id.product_uom_qty', string="Ordered Qty")
+
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 3aaae12d..57217894 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -1813,10 +1813,10 @@ class SaleOrder(models.Model):
     #             rec.commitment_date = rec.expected_ready_to_ship
 
                 
-    @api.onchange('expected_ready_to_ship') #Hangle Onchange form Expected Ready to Ship
+    @api.onchange('expected_ready_to_ship')
     def _onchange_expected_ready_ship_date(self):
         self._validate_expected_ready_ship_date()
-
+    
     def _set_etrts_date(self):
         for order in self:
             if order.state in ('done', 'cancel', 'sale'):
@@ -2241,7 +2241,7 @@ class SaleOrder(models.Model):
                 raise UserError("Payment Term pada Master Data Customer harus diisi")
             if not partner.active_limit and term_days > 0:
                 raise UserError("Credit Limit pada Master Data Customer harus diisi")
-            if order.payment_term_id != partner.property_payment_term_id:
+            if order.payment_term_id != partner.property_payment_term_id and not order.partner_id.id == 29179:
                 raise UserError("Payment Term berbeda pada Master Data Customer")
             if (partner.customer_type == 'pkp' or order.customer_type == 'pkp') and order.npwp != partner.npwp:
                 raise UserError("NPWP berbeda pada Master Data Customer")
@@ -2324,7 +2324,7 @@ class SaleOrder(models.Model):
                 raise UserError("Payment Term pada Master Data Customer harus diisi")
             if not partner.active_limit and term_days > 0:
                 raise UserError("Credit Limit pada Master Data Customer harus diisi")
-            if order.payment_term_id != partner.property_payment_term_id:
+            if order.payment_term_id != partner.property_payment_term_id and not order.partner_id.id == 29179:
                 raise UserError("Payment Term berbeda pada Master Data Customer")
             if (partner.customer_type == 'pkp' or order.customer_type == 'pkp') and order.npwp != partner.npwp:
                 raise UserError("NPWP berbeda pada Master Data Customer")
@@ -3328,12 +3328,15 @@ class SaleOrder(models.Model):
             for order in self:
                 partner = order.partner_id.parent_id or order.partner_id
                 customer_payment_term = partner.property_payment_term_id
-                if vals['payment_term_id'] != customer_payment_term.id:
+                if vals['payment_term_id'] != customer_payment_term.id and not order.partner_id.id == 29179:
                     raise UserError(
                         f"Payment Term berbeda pada Master Data Customer. "
                         f"Harap ganti ke '{customer_payment_term.name}' "
                         f"sesuai dengan payment term yang terdaftar pada customer."
                     )
+                
+                if order.partner_id.id == 29179 and vals['payment_term_id'] not in [25,28]:
+                    raise UserError(_("Pilih payment term 60 hari atau 30 hari."))
 
 
         res = super(SaleOrder, self).write(vals)
diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index d6505a86..b7db8775 100644
--- a/indoteknik_custom/models/stock_move.py
+++ b/indoteknik_custom/models/stock_move.py
@@ -19,6 +19,7 @@ class StockMove(models.Model):
     vendor_id = fields.Many2one('res.partner' ,string='Vendor')
     hold_outgoingg = fields.Boolean('Hold Outgoing', default=False)
     product_image = fields.Binary(related="product_id.image_128", string="Product Image", readonly=True)
+    partial = fields.Boolean('Partial?', default=False)
 
     # @api.model_create_multi
     # def create(self, vals_list):
diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index a1adc90a..a6175b21 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -185,6 +185,9 @@ access_v_sale_notin_matchpo,access.v.sale.notin.matchpo,model_v_sale_notin_match
 access_approval_payment_term,access.approval.payment.term,model_approval_payment_term,,1,1,1,1
 access_purchase_order_update_date_wizard,access.purchase.order.update.date.wizard,model_purchase_order_update_date_wizard,,1,1,1,1
 access_change_date_planned_wizard,access.change.date.planned.wizard,model_change_date_planned_wizard,,1,1,1,1
+access_partial_delivery_wizard,access.partial.delivery.wizard,model_partial_delivery_wizard,,1,1,1,1
+access_partial_delivery_wizard_line,access.partial.delivery.wizard.line,model_partial_delivery_wizard_line,,1,1,1,1
+access_apo_domain_config,access.apo.domain.config,model_apo_domain_config,base.group_user,1,1,1,1
 access_refund_sale_order,access.refund.sale.order,model_refund_sale_order,base.group_user,1,1,1,1
 access_refund_sale_order_line,access.refund.sale.order.line,model_refund_sale_order_line,base.group_user,1,1,1,1
 
diff --git a/indoteknik_custom/views/domain_apo.xml b/indoteknik_custom/views/domain_apo.xml
new file mode 100644
index 00000000..1dae473d
--- /dev/null
+++ b/indoteknik_custom/views/domain_apo.xml
@@ -0,0 +1,46 @@
+<odoo>
+    <record id="view_apo_domain_config_tree" model="ir.ui.view">
+        <field name="name">apo.domain.config.tree</field>
+        <field name="model">apo.domain.config</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="vendor_id"/>
+                <field name="brand_ids"/>
+                <field name="is_special"/>
+                <field name="payment_term_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_apo_domain_config_form" model="ir.ui.view">
+        <field name="name">apo.domain.config.form</field>
+        <field name="model">apo.domain.config</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="name"/>
+                        <field name="vendor_id"/>
+                        <field name="brand_ids"/>
+                        <field name="is_special"/>
+                        <field name="payment_term_id"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="domain_apo_action" model="ir.actions.act_window">
+        <field name="name">Domain APO</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">apo.domain.config</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_automatic_purchase"
+        name="Domain APO"
+        action="domain_apo_action"
+        parent="menu_monitoring_in_purchase"
+        sequence="200"/>
+</odoo>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 8d56bbbd..eeb51eaa 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -7,6 +7,12 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <button id="action_confirm" position="after">
+                    <button name="action_open_partial_delivery_wizard"
+                    string="Partial Delivery"
+                    type="object"
+                    class="oe_highlight"
+                    attrs="{'invisible': [('state','!=','sale')]}"/>
+
                     <button name="calculate_line_no"
                             string="Create No"
                             type="object"
@@ -365,9 +371,14 @@
                 </field>
                 <field name="payment_term_id" position="attributes">
                     <attribute name="attrs">
-                        {'readonly': ['|', ('approval_status', 'in', ['pengajuan1', 'pengajuan2', 'approved']),
-                        ('state', 'not in',
-                        ['cancel', 'draft'])]}
+                        {
+                            'readonly': [
+                                '|', '|',
+                                ('approval_status', 'in', ['pengajuan1', 'pengajuan2', 'approved']),
+                                ('state', 'not in', ['cancel', 'draft']),
+                                ('partner_id', 'not in', [29179])
+                            ]
+                        }
                     </attribute>
                 </field>
 
@@ -502,6 +513,37 @@
             </field>
         </record>
 
+        <record id="view_partial_delivery_wizard_form" model="ir.ui.view">
+            <field name="name">partial.delivery.wizard.form</field>
+            <field name="model">partial.delivery.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Partial Delivery">
+                    <sheet>
+                        <group>
+                            <field name="sale_id" invisible="1"/>
+                            <field name="picking_ids" invisible="1"/>
+                            <field name="picking_id" options="{'no_create': True, 'no_create_edit': True}" />
+                            <field name="line_ids" options="{'no_create': True, 'no_create_edit': True}">
+                                <tree editable="bottom">
+                                    <field name="selected"/>
+                                    <field name="product_id" readonly="1" force_save="1"/>
+                                    <field name="move_id" readonly="1" force_save="1"/>
+                                    <field name="ordered_qty"/>
+                                    <field name="reserved_qty" readonly="1" force_save="1"/>
+                                    <field name="selected_qty" invisible="0"/>
+                                </tree>
+                            </field>
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button string="Confirm" type="object" name="action_confirm_partial_delivery" class="btn-primary"/>
+                        <button string="Cancel" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+
         <record id="sale_order_multi_update_ir_actions_server" model="ir.actions.server">
             <field name="name">Mark As Cancel</field>
             <field name="model_id" ref="sale.model_sale_order"/>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index d943f27a..44ab6355 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -207,6 +207,7 @@
                 <field name="product_uom" position="after">
                     <field name="sale_id" attrs="{'readonly': 1}" optional="hide"/>
                     <field name="print_barcode" optional="hide"/>
+                    <field name="partial" widget="boolean_toggle" optional="hide"/>
                     <field name="qr_code_variant" widget="image" optional="hide"/>
                     <field name="barcode" optional="hide"/>
                 </field>
-- 
cgit v1.2.3


From f71f148d00b546bc46922eeeeaa512f79cecd573 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 8 Oct 2025 15:04:22 +0700
Subject: <Miqdad> balikin sp

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

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 217e76cb..4772c433 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -178,14 +178,6 @@ class StockPicking(models.Model):
     area_name = fields.Char(string="Area", compute="_compute_area_name")
     is_bu_iu = fields.Boolean('Is BU/IU', compute='_compute_is_bu_iu', default=False, copy=False, readonl=True)
 
-    @api.constrains('driver_departure_date')
-    def _constrains_driver_departure_date(self):
-        allowed_user_ids = [17, 6277, 25]
-        for record in self:
-            if record.driver_departure_date and self.env.user.id not in allowed_user_ids:
-                raise UserError("Hanya Denise dan Faishal yang dapat mengubah Delivery Departure Date.")
-
-
     @api.depends('name')
     def _compute_is_bu_iu(self):
         for record in self:
-- 
cgit v1.2.3


From c8b3d4f3c5da81eb3858af6b8a7fc54b83a286a5 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 8 Oct 2025 15:20:43 +0700
Subject: <Miqdad> delivery departure date val

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

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 4772c433..8e947267 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1654,6 +1654,11 @@ class StockPicking(models.Model):
                             line.sale_line_id = sale_line.id
 
     def write(self, vals):
+        allowed_user_ids = [17, 6277]
+        if 'driver_departure_date' in vals:
+            if self.env.user.id not in allowed_user_ids and not self.env.context.get('allow_driver_departure_edit'):
+                raise UserError("Hanya Denise dan Faisal yang dapat mengubah Delivery Departure Date.")
+
         if 'linked_manual_bu_out' in vals:
             for record in self:
                 if (record.picking_type_code == 'internal'
-- 
cgit v1.2.3


From 7b17ded8576c86470c56e5ccf961d0378b3a820f Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 8 Oct 2025 15:24:43 +0700
Subject: <Miqdad> remove approval status api SO

---
 indoteknik_api/controllers/api_v1/sale_order.py |  2 --
 indoteknik_custom/models/sale_order.py          | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 5d6a4117..56b49f9a 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -242,7 +242,6 @@ class SaleOrder(controller.Controller):
                 'eligibleContinue': eligible,
                 'paymentSummary': {
                     'eligible': eligible,
-                    'approvalStatus': so.approval_status or '',
                     'paymentStatus': pay_status,
                     'paymentTermId': so.payment_term_id.id if so.payment_term_id else None,
                     'sourceId': so.source_id.id if so.source_id else None,
@@ -315,7 +314,6 @@ class SaleOrder(controller.Controller):
                 'eligible_continue': eligible,
                 'payment_summary': {
                     'eligible': eligible,
-                    'approval_status': sale_order.approval_status or '',
                     'payment_status': pay_status,
                     'payment_term_id': sale_order.payment_term_id.id if sale_order.payment_term_id else None,
                     'source_id': sale_order.source_id.id if sale_order.source_id else None,
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 57217894..4a7203a1 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -1984,10 +1984,10 @@ class SaleOrder(models.Model):
         #     raise UserError('Kelurahan Real Delivery Address harus diisi')
 
     def generate_payment_link_midtrans_sales_order(self):
-        # midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions'  # dev - sandbox
-        # midtrans_auth = 'Basic U0ItTWlkLXNlcnZlci1uLVY3ZDJjMlpCMFNWRUQyOU95Q1dWWXA6'  # dev - sandbox
-        midtrans_url = 'https://app.midtrans.com/snap/v1/transactions'          # production
-        midtrans_auth = 'Basic TWlkLXNlcnZlci1SbGMxZ2gzWGpSVW5scl9JblZzTV9OTnU6' # production
+        midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions'  # dev - sandbox
+        midtrans_auth = 'Basic U0ItTWlkLXNlcnZlci1uLVY3ZDJjMlpCMFNWRUQyOU95Q1dWWXA6'  # dev - sandbox
+        # midtrans_url = 'https://app.midtrans.com/snap/v1/transactions'          # production
+        # midtrans_auth = 'Basic TWlkLXNlcnZlci1SbGMxZ2gzWGpSVW5scl9JblZzTV9OTnU6' # production
 
         so_number = self.name
         so_number = so_number.replace('/', '-')
@@ -2000,8 +2000,8 @@ class SaleOrder(models.Model):
         }
 
         # ==== ENV ====
-        # check_url = f'https://api.sandbox.midtrans.com/v2/{so_number}/status'  # dev - sandbox
-        check_url = f'https://api.midtrans.com/v2/{so_number}/status'        # production
+        check_url = f'https://api.sandbox.midtrans.com/v2/{so_number}/status'  # dev - sandbox
+        # check_url = f'https://api.midtrans.com/v2/{so_number}/status'        # production
         # =============================================
 
         check_response = requests.get(check_url, headers=headers)
-- 
cgit v1.2.3


From a9aff3725c86ae6e864e8b5e2b45596ef7dff6e0 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 8 Oct 2025 17:15:05 +0700
Subject: fix bug

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

diff --git a/indoteknik_custom/models/partial_delivery.py b/indoteknik_custom/models/partial_delivery.py
index c9d2ba5c..c9b188ea 100644
--- a/indoteknik_custom/models/partial_delivery.py
+++ b/indoteknik_custom/models/partial_delivery.py
@@ -74,9 +74,6 @@ class PartialDeliveryWizard(models.TransientModel):
 
         if not selected_lines:
             raise UserError(_("Tidak ada produk yang dipilih atau diisi jumlahnya."))
-        
-        if selected_lines.selected_qty > selected_lines.reserved_qty:
-            raise UserError(_("Jumlah produk yang dipilih melebihi jumlah reserved."))
 
         new_picking = StockPicking.create({
             'origin': picking.origin,
@@ -89,6 +86,8 @@ class PartialDeliveryWizard(models.TransientModel):
         })
 
         for line in selected_lines:
+            if line.selected_qty > line.reserved_qty:
+                raise UserError(_("Jumlah produk %s yang dipilih melebihi jumlah reserved.") % line.product_id.display_name)
             move = line.move_id
             move._do_unreserve()
 
-- 
cgit v1.2.3


From 60a1f399181eb310beaf9f5ee9a7b0a6033b60ee Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 9 Oct 2025 09:51:01 +0700
Subject: PUSH

---
 indoteknik_custom/views/sale_order.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index eeb51eaa..9620bf50 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -373,10 +373,9 @@
                     <attribute name="attrs">
                         {
                             'readonly': [
-                                '|', '|',
+                                '|',
                                 ('approval_status', 'in', ['pengajuan1', 'pengajuan2', 'approved']),
-                                ('state', 'not in', ['cancel', 'draft']),
-                                ('partner_id', 'not in', [29179])
+                                ('state', 'not in', ['cancel', 'draft'])
                             ]
                         }
                     </attribute>
-- 
cgit v1.2.3


From 393958c36bf49b7b2dbd888b81c345b7734151a0 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 9 Oct 2025 11:35:17 +0700
Subject: <Miqdad> balikin del dep date

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

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 8e947267..87182277 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1654,10 +1654,10 @@ class StockPicking(models.Model):
                             line.sale_line_id = sale_line.id
 
     def write(self, vals):
-        allowed_user_ids = [17, 6277]
-        if 'driver_departure_date' in vals:
-            if self.env.user.id not in allowed_user_ids and not self.env.context.get('allow_driver_departure_edit'):
-                raise UserError("Hanya Denise dan Faisal yang dapat mengubah Delivery Departure Date.")
+        # allowed_user_ids = [17, 6277]
+        # if 'driver_departure_date' in vals:
+        #     if self.env.user.id not in allowed_user_ids and not self.env.context.get('allow_driver_departure_edit'):
+        #         raise UserError("Hanya Denise dan Faisal yang dapat mengubah Delivery Departure Date.")
 
         if 'linked_manual_bu_out' in vals:
             for record in self:
-- 
cgit v1.2.3


From b25d39b4d5dd456ef2e40a25ce3608e5c9b6694d Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 9 Oct 2025 14:55:00 +0700
Subject: <Miqdad> fix delivery departure date validation

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

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 87182277..8a5888fc 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -471,9 +471,9 @@ class StockPicking(models.Model):
             if len(picking.scan_koli_lines) > 0:
                 if len(picking.scan_koli_lines) != picking.total_mapping_koli:
                     raise UserError("Scan Koli Tidak Sesuai Dengan Total Mapping Koli")
-
-                picking.driver_departure_date = now
-
+                picking.with_context(allow_driver_departure_edit=True).write({
+                    'driver_departure_date': now
+                })
     @api.depends('total_so_koli')
     def _compute_total_so_koli(self):
         for picking in self:
@@ -1654,10 +1654,10 @@ class StockPicking(models.Model):
                             line.sale_line_id = sale_line.id
 
     def write(self, vals):
-        # allowed_user_ids = [17, 6277]
-        # if 'driver_departure_date' in vals:
-        #     if self.env.user.id not in allowed_user_ids and not self.env.context.get('allow_driver_departure_edit'):
-        #         raise UserError("Hanya Denise dan Faisal yang dapat mengubah Delivery Departure Date.")
+        allowed_user_ids = [17, 6277]
+        if 'driver_departure_date' in vals:
+            if self.env.user.id not in allowed_user_ids and not self.env.context.get('allow_driver_departure_edit'):
+                raise UserError("Hanya Denise dan Faisal yang dapat mengubah Delivery Departure Date.")
 
         if 'linked_manual_bu_out' in vals:
             for record in self:
-- 
cgit v1.2.3


From 137e812a5d96e1d5a82ceffbdf6a0938358e4d07 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 10 Oct 2025 09:50:49 +0700
Subject: <Miqdad> add lampiran ke xx/xx to sj tele

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

diff --git a/indoteknik_custom/models/sj_tele.py b/indoteknik_custom/models/sj_tele.py
index 5ea08340..3ef4b877 100644
--- a/indoteknik_custom/models/sj_tele.py
+++ b/indoteknik_custom/models/sj_tele.py
@@ -66,10 +66,12 @@ class SjTele(models.Model):
 
         header = "Berikut merupakan nomor BU/OUT yang belum ada di Logbook SJ report:\n"
         BUB = 20  # jumlah baris per bubble
+        total = (len(lines) + BUB - 1) // BUB  # total bubble
 
         for i in range(0, len(lines), BUB):
             body = "\n".join(lines[i:i + BUB])
-            text = header + body
+            bagian = (i // BUB) + 1
+            text = f"{header}Lampiran ke {bagian}/{total}\n{body}"
             try:
                 r = requests.post(
                     api_base + "/sendMessage",
-- 
cgit v1.2.3


From fd3ce46f21aa78d9b9caa6ffdd1b9f61d89dfa65 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 10 Oct 2025 10:42:39 +0700
Subject: select all and unselect all

---
 indoteknik_custom/models/partial_delivery.py | 26 ++++++++++++++++
 indoteknik_custom/views/sale_order.xml       | 45 ++++++++++++++++------------
 2 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/indoteknik_custom/models/partial_delivery.py b/indoteknik_custom/models/partial_delivery.py
index c9b188ea..1204089b 100644
--- a/indoteknik_custom/models/partial_delivery.py
+++ b/indoteknik_custom/models/partial_delivery.py
@@ -41,6 +41,32 @@ class PartialDeliveryWizard(models.TransientModel):
     #     res['line_ids'] = lines
     #     return res
 
+    def action_select_all(self):
+        for line in self.line_ids:
+            line.selected = True
+        # return action supaya wizard gak nutup
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': self._name,
+            'view_mode': 'form',
+            'res_id': self.id,
+            'target': 'new',
+        }
+
+    def action_unselect_all(self):
+        for line in self.line_ids:
+            line.selected = False
+        # juga reload biar tetap di wizard
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': self._name,
+            'view_mode': 'form',
+            'res_id': self.id,
+            'target': 'new',
+        }
+
+
+
     @api.onchange('picking_id')
     def _onchange_picking_id(self):
         """Generate lines whenever picking_id is changed"""
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 9620bf50..82daa36f 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -516,33 +516,40 @@
             <field name="name">partial.delivery.wizard.form</field>
             <field name="model">partial.delivery.wizard</field>
             <field name="arch" type="xml">
-                <form string="Partial Delivery">
-                    <sheet>
-                        <group>
-                            <field name="sale_id" invisible="1"/>
-                            <field name="picking_ids" invisible="1"/>
-                            <field name="picking_id" options="{'no_create': True, 'no_create_edit': True}" />
-                            <field name="line_ids" options="{'no_create': True, 'no_create_edit': True}">
-                                <tree editable="bottom">
-                                    <field name="selected"/>
-                                    <field name="product_id" readonly="1" force_save="1"/>
-                                    <field name="move_id" readonly="1" force_save="1"/>
-                                    <field name="ordered_qty"/>
-                                    <field name="reserved_qty" readonly="1" force_save="1"/>
-                                    <field name="selected_qty" invisible="0"/>
-                                </tree>
-                            </field>
-                        </group>
-                    </sheet>
+                <form string="Partial Delivery Wizard">
+                    <group>
+                        <!-- Field ini WAJIB ada walau invisible -->
+                        <field name="picking_ids" invisible="1"/>
+
+                        <field name="picking_id"/>
+                    </group>
+
+                    <separator string="Products"/>
+                    <div class="oe_button_box" name="select_all_box">
+                        <button name="action_select_all" string="✅ Select All" type="object" class="btn-primary"/>
+                        <button name="action_unselect_all" string="❌ Unselect All" type="object" class="btn-secondary"/>
+                    </div>
+
+                    <field name="line_ids" context="{'default_wizard_id': active_id}" widget="many2many">
+                        <tree editable="bottom">
+                            <field name="selected"/>
+                            <field name="product_id"/>
+                            <field name="ordered_qty" readonly="1"/>
+                            <field name="reserved_qty" readonly="1"/>
+                            <field name="selected_qty"/>
+                        </tree>
+                    </field>
+
                     <footer>
                         <button string="Confirm" type="object" name="action_confirm_partial_delivery" class="btn-primary"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel"/>
                     </footer>
                 </form>
             </field>
         </record>
 
 
+
         <record id="sale_order_multi_update_ir_actions_server" model="ir.actions.server">
             <field name="name">Mark As Cancel</field>
             <field name="model_id" ref="sale.model_sale_order"/>
-- 
cgit v1.2.3


From e8ffbec31ade7e33d4da2c82c1c675f9291b38ef Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 10 Oct 2025 10:55:28 +0700
Subject: <Miqdad> approval datedoc del dep date

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

diff --git a/indoteknik_custom/models/approval_date_doc.py b/indoteknik_custom/models/approval_date_doc.py
index 638b44d7..3ba3b8dc 100644
--- a/indoteknik_custom/models/approval_date_doc.py
+++ b/indoteknik_custom/models/approval_date_doc.py
@@ -40,7 +40,7 @@ class ApprovalDateDoc(models.Model):
             raise UserError("Hanya Accounting Yang Bisa Approve")
         self.check_invoice_so_picking
         # Tambahkan context saat mengupdate date_doc_kirim
-        self.picking_id.with_context(from_button_approve=True).write({
+        self.picking_id.with_context(from_button_approve=True, allow_driver_departure_edit=True).write({
             'driver_departure_date': self.driver_departure_date,
             'date_doc_kirim': self.driver_departure_date,
             'update_date_doc_kirim_add': True
-- 
cgit v1.2.3


From e4b191155bf44bfcd58d6ae1b95d4a112bd43547 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 10 Oct 2025 11:17:41 +0700
Subject: <Miqdad> balikin driver dep date

---
 indoteknik_custom/models/approval_date_doc.py |  2 +-
 indoteknik_custom/models/stock_picking.py     | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/indoteknik_custom/models/approval_date_doc.py b/indoteknik_custom/models/approval_date_doc.py
index 3ba3b8dc..638b44d7 100644
--- a/indoteknik_custom/models/approval_date_doc.py
+++ b/indoteknik_custom/models/approval_date_doc.py
@@ -40,7 +40,7 @@ class ApprovalDateDoc(models.Model):
             raise UserError("Hanya Accounting Yang Bisa Approve")
         self.check_invoice_so_picking
         # Tambahkan context saat mengupdate date_doc_kirim
-        self.picking_id.with_context(from_button_approve=True, allow_driver_departure_edit=True).write({
+        self.picking_id.with_context(from_button_approve=True).write({
             'driver_departure_date': self.driver_departure_date,
             'date_doc_kirim': self.driver_departure_date,
             'update_date_doc_kirim_add': True
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 8a5888fc..4772c433 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -471,9 +471,9 @@ class StockPicking(models.Model):
             if len(picking.scan_koli_lines) > 0:
                 if len(picking.scan_koli_lines) != picking.total_mapping_koli:
                     raise UserError("Scan Koli Tidak Sesuai Dengan Total Mapping Koli")
-                picking.with_context(allow_driver_departure_edit=True).write({
-                    'driver_departure_date': now
-                })
+
+                picking.driver_departure_date = now
+
     @api.depends('total_so_koli')
     def _compute_total_so_koli(self):
         for picking in self:
@@ -1654,11 +1654,6 @@ class StockPicking(models.Model):
                             line.sale_line_id = sale_line.id
 
     def write(self, vals):
-        allowed_user_ids = [17, 6277]
-        if 'driver_departure_date' in vals:
-            if self.env.user.id not in allowed_user_ids and not self.env.context.get('allow_driver_departure_edit'):
-                raise UserError("Hanya Denise dan Faisal yang dapat mengubah Delivery Departure Date.")
-
         if 'linked_manual_bu_out' in vals:
             for record in self:
                 if (record.picking_type_code == 'internal'
-- 
cgit v1.2.3


From b0d0e26965ab1ba7aa0c5a607cc0a12a67546dfc Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Fri, 10 Oct 2025 14:48:36 +0700
Subject: (andri) fix

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

diff --git a/indoteknik_custom/models/user_pengajuan_tempo_request.py b/indoteknik_custom/models/user_pengajuan_tempo_request.py
index 8ed92fc8..6e8498f7 100644
--- a/indoteknik_custom/models/user_pengajuan_tempo_request.py
+++ b/indoteknik_custom/models/user_pengajuan_tempo_request.py
@@ -365,7 +365,7 @@ class UserPengajuanTempoRequest(models.Model):
     @api.onchange('tempo_duration')
     def _tempo_duration_change(self):
         for tempo in self:
-            if tempo.env.user.id not in (7, 688, 28, 377, 12182, 375):
+            if tempo.env.user.id not in (7, 688, 28, 377, 12182, 375, 19):
                 raise UserError("Durasi tempo hanya bisa di ubah oleh Sales Manager atau Direktur")
 
     @api.onchange('tempo_limit')
-- 
cgit v1.2.3


From 1bdead2b6486ee5ee0e20cdbfd302667671301be Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 13 Oct 2025 11:02:36 +0700
Subject: <Miqdad> add qty reserved in product move tree view

---
 indoteknik_custom/views/stock_move_line.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indoteknik_custom/views/stock_move_line.xml b/indoteknik_custom/views/stock_move_line.xml
index 94c0bf53..ac8d3dbe 100644
--- a/indoteknik_custom/views/stock_move_line.xml
+++ b/indoteknik_custom/views/stock_move_line.xml
@@ -20,6 +20,9 @@
             <field name="product_id" position="after">
                 <field name="manufacture"/>
             </field>
+            <field name="qty_done" position="after">
+                <field name="product_uom_qty"/>
+            </field>
         </field>
     </record>
 </odoo>
-- 
cgit v1.2.3


From 23a2d929b209c6121d3bf4e3b35e6bfec4a99e8d Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 13 Oct 2025 11:09:37 +0700
Subject: fix bug

---
 indoteknik_custom/models/partial_delivery.py | 85 +++++++++++++++++++++++-----
 1 file changed, 72 insertions(+), 13 deletions(-)

diff --git a/indoteknik_custom/models/partial_delivery.py b/indoteknik_custom/models/partial_delivery.py
index 1204089b..83fe9981 100644
--- a/indoteknik_custom/models/partial_delivery.py
+++ b/indoteknik_custom/models/partial_delivery.py
@@ -42,6 +42,8 @@ class PartialDeliveryWizard(models.TransientModel):
     #     return res
 
     def action_select_all(self):
+        if len(self.line_ids) == 0:
+            raise UserError(_("Tidak ada produk yang dipilih."))
         for line in self.line_ids:
             line.selected = True
         # return action supaya wizard gak nutup
@@ -54,6 +56,8 @@ class PartialDeliveryWizard(models.TransientModel):
         }
 
     def action_unselect_all(self):
+        if len(self.line_ids) == 0:
+            raise UserError(_("Tidak ada produk yang dipilih."))
         for line in self.line_ids:
             line.selected = False
         # juga reload biar tetap di wizard
@@ -65,21 +69,41 @@ class PartialDeliveryWizard(models.TransientModel):
             'target': 'new',
         }
 
-
-
     @api.onchange('picking_id')
     def _onchange_picking_id(self):
         """Generate lines whenever picking_id is changed"""
-        lines = []
-        if self.picking_id:
-            moves = self.picking_id.move_ids_without_package.filtered(lambda m: m.reserved_availability > 0)
-            for move in moves:
-                lines.append((0, 0, {
-                    'product_id': move.product_id.id,
-                    'reserved_qty': move.reserved_availability,
-                    'move_id': move.id,
-                }))
-        self.line_ids = lines
+        if not self.picking_id:
+            self.line_ids = [(5, 0, 0)]
+            return
+
+        # 🧹 hapus line lama dulu
+        if self.line_ids:
+            self.line_ids.unlink()
+
+        moves = self.picking_id.move_lines or self.picking_id.move_ids_without_package
+        moves = moves.filtered(lambda m: m.product_id and m.reserved_availability > 0)
+
+        if not moves:
+            _logger.warning(f"[PartialDeliveryWizard] Tidak ada move line di picking {self.picking_id.name}")
+            return
+
+        for move in moves:
+            reserved_qty = move.reserved_availability or 0.0
+            ordered_qty = move.sale_line_id.product_uom_qty if move.sale_line_id else 0.0
+
+            self.env['partial.delivery.wizard.line'].create({
+                'wizard_id': self.id,
+                'product_id': move.product_id.id,
+                'reserved_qty': reserved_qty,
+                'selected_qty': reserved_qty,  # biar langsung keisi default
+                'move_id': move.id,
+                'sale_line_id': move.sale_line_id.id if move.sale_line_id else False,
+            })
+
+            _logger.info(
+                f"[PartialDeliveryWizard] ✅ Created line for {move.product_id.display_name} "
+                f"(reserved={reserved_qty}, move_id={move.id})"
+            )
 
 
     def action_confirm_partial_delivery(self):
@@ -92,7 +116,6 @@ class PartialDeliveryWizard(models.TransientModel):
 
         if picking.state != "assigned":
             raise UserError(_("Picking harus dalam status Ready (assigned)."))
-        
 
         lines_by_qty = self.line_ids.filtered(lambda l: l.selected_qty > 0)
         lines_by_selected = self.line_ids.filtered(lambda l: l.selected and not l.selected_qty)
@@ -101,6 +124,37 @@ class PartialDeliveryWizard(models.TransientModel):
         if not selected_lines:
             raise UserError(_("Tidak ada produk yang dipilih atau diisi jumlahnya."))
 
+        # 🧠 Tambahan: kalau semua line dipilih (full delivery)
+        all_selected = len(selected_lines) == len(self.line_ids)
+        full_selected = all_selected and all(
+            (line.selected_qty or line.reserved_qty) >= line.reserved_qty
+            for line in selected_lines
+        )
+
+        if full_selected:
+            # 💡 Gak perlu bikin picking baru, langsung ubah state_reserve
+            picking.write({'state_reserve': 'partial'})
+
+            # Tambahin log aja biar ada jejak
+            picking.message_post(
+                body=f"<b>Full Picking Confirmed</b> dari wizard partial delivery oleh {self.env.user.name}",
+                message_type="comment",
+                subtype_xmlid="mail.mt_note",
+            )
+
+            return {
+                "type": "ir.actions.act_window",
+                "res_model": "stock.picking",
+                "view_mode": "form",
+                "res_id": picking.id,
+                "target": "current",
+                "effect": {
+                    "fadeout": "slow",
+                    "message": f"✅ Semua produk dikirim penuh — tidak dibuat DO baru.",
+                    "type": "rainbow_man",
+                },
+            }
+
         new_picking = StockPicking.create({
             'origin': picking.origin,
             'partner_id': picking.partner_id.id,
@@ -212,3 +266,8 @@ class PartialDeliveryWizardLine(models.TransientModel):
     sale_line_id = fields.Many2one('sale.order.line', string="SO Line", related='move_id.sale_line_id')
     ordered_qty = fields.Float(related='sale_line_id.product_uom_qty', string="Ordered Qty")
 
+    @api.onchange('selected')
+    def onchange_selected(self):
+        if self.selected:
+            self.selected_qty = self.reserved_qty
+
-- 
cgit v1.2.3


From 40c66acf47f900ecd776358758ac053347c078c7 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 13 Oct 2025 11:21:04 +0700
Subject: <Miqdad> set back to pengajuan1 when CO from website and change SO
 line behavior onchange vendor_id

---
 indoteknik_api/controllers/api_v1/sale_order.py | 12 ++++++++----
 indoteknik_custom/models/sale_order.py          |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 56b49f9a..741dc0b1 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -231,10 +231,11 @@ class SaleOrder(controller.Controller):
         for so in filtered_orders_paginated:
             item = request.env['sale.order'].api_v1_single_response(so)
 
+            approval_ok = (so.approval_status in ('pengajuan1', 'pengajuan2'))
             source_ok = _is_website_order(so)
             term_ok = bool(so.payment_term_id and so.payment_term_id.id == CBD_PAYMENT_TERM_ID)
             pay_status = (getattr(so, 'payment_status', '') or '').strip().lower()
-            eligible = bool(source_ok and term_ok and pay_status in ALLOWED_CONTINUE)
+            eligible = bool(approval_ok and source_ok and term_ok and pay_status in ALLOWED_CONTINUE)
 
             redirect_url = getattr(so, 'payment_link_midtrans', '') or ''
 
@@ -242,6 +243,7 @@ class SaleOrder(controller.Controller):
                 'eligibleContinue': eligible,
                 'paymentSummary': {
                     'eligible': eligible,
+                    'approvalStatus': so.approval_status or '',
                     'paymentStatus': pay_status,
                     'paymentTermId': so.payment_term_id.id if so.payment_term_id else None,
                     'sourceId': so.source_id.id if so.source_id else None,
@@ -283,6 +285,7 @@ class SaleOrder(controller.Controller):
 
             pay_status = (getattr(sale_order, 'payment_status', '') or '').strip().lower()
             eligible = (
+                    sale_order.approval_status in ('pengajuan1', 'pengajuan2') and
                     _is_website_order(sale_order) and
                     sale_order.payment_term_id and sale_order.payment_term_id.id == CBD_PAYMENT_TERM_ID and
                     pay_status in ALLOWED_CONTINUE
@@ -314,6 +317,7 @@ class SaleOrder(controller.Controller):
                 'eligible_continue': eligible,
                 'payment_summary': {
                     'eligible': eligible,
+                    'approval_status': sale_order.approval_status or '',
                     'payment_status': pay_status,
                     'payment_term_id': sale_order.payment_term_id.id if sale_order.payment_term_id else None,
                     'source_id': sale_order.source_id.id if sale_order.source_id else None,
@@ -723,9 +727,9 @@ class SaleOrder(controller.Controller):
                 _logger.info(f"Updated user_id from partner: {parameters['user_id']}")
 
             if params['value']['type'] == 'sale_order':
-                # parameters['approval_status'] = 'pengajuan1'
-                parameters['approval_status'] = False
-                _logger.info("Setting approval_status to 'false'")
+                parameters['approval_status'] = 'pengajuan1'
+                # parameters['approval_status'] = False
+                _logger.info("Setting approval_status to 'pengajuan1'")
 
             sale_order = request.env['sale.order'].with_context(from_website_checkout=True).create([parameters])
             sale_order.onchange_partner_contact()
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 4a7203a1..2d2d71b3 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -3230,6 +3230,7 @@ class SaleOrder(models.Model):
         # order._auto_set_shipping_from_website()
         order._compute_etrts_date()
         order._validate_expected_ready_ship_date()
+        order.onchange_vendor_id()
         # order._validate_delivery_amt()
         # order._check_total_margin_excl_third_party()
         # order._update_partner_details()
-- 
cgit v1.2.3


From dab2cdebb698b817b979efd2087175060f9b8f03 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 13 Oct 2025 13:01:35 +0700
Subject: <Miqdad> change SO line behavior onchange vendor_id

---
 indoteknik_custom/models/sale_order.py      | 11 ++++-
 indoteknik_custom/models/sale_order_line.py | 62 ++++++++++++++++++-----------
 2 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 2d2d71b3..3bd1ca59 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -3230,7 +3230,10 @@ class SaleOrder(models.Model):
         # order._auto_set_shipping_from_website()
         order._compute_etrts_date()
         order._validate_expected_ready_ship_date()
-        order.onchange_vendor_id()
+        for line in order.order_line:
+            updated_vals = line._update_purchase_info()
+            if updated_vals:
+                line.write(updated_vals)
         # order._validate_delivery_amt()
         # order._check_total_margin_excl_third_party()
         # order._update_partner_details()
@@ -3362,6 +3365,12 @@ class SaleOrder(models.Model):
         if any(field in vals for field in ["order_line", "client_order_ref"]):
             self._calculate_etrts_date()
 
+        for order in self:
+            for line in order.order_line:
+                updated_vals = line._update_purchase_info()
+                if updated_vals:
+                    line.write(updated_vals)
+
         return res
     
     def button_refund(self):
diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index 1f2ea1fb..f8fb898c 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -247,29 +247,29 @@ class SaleOrderLine(models.Model):
             margin_per_item = sales_price - purchase_price
             line.item_before_margin = margin_per_item
 
-    @api.onchange('vendor_id')
-    def onchange_vendor_id(self):
-        # TODO : need to change this logic @stephan
-        if not self.product_id or self.product_id.type == 'service':
-            return
-        elif self.product_id.categ_id.id == 34:  # finish good / manufacturing only
-            cost = self.product_id.standard_price
-            self.purchase_price = cost
-        elif self.product_id.x_manufacture.override_vendor_id:
-            # purchase_price = self.env['purchase.pricelist'].search(
-            #     [('vendor_id', '=', self.product_id.x_manufacture.override_vendor_id.id),
-            #      ('product_id', '=', self.product_id.id)],
-            #     limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
-            price, taxes, vendor_id = self._get_purchase_price_by_vendor(self.product_id, self.vendor_id)
-            self.purchase_price = price
-            self.purchase_tax_id = taxes
-        # else:
-        # purchase_price = self.env['purchase.pricelist'].search(
-        #     [('vendor_id', '=', self.vendor_id.id), ('product_id', '=', self.product_id.id)],
-        #     limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
-        # price, taxes = self._get_valid_purchase_price(purchase_price)
-        # self.purchase_price = price
-        # self.purchase_tax_id = taxes
+    # @api.onchange('vendor_id')
+    # def onchange_vendor_id(self):
+    #     # TODO : need to change this logic @stephan
+    #     if not self.product_id or self.product_id.type == 'service':
+    #         return
+    #     elif self.product_id.categ_id.id == 34:  # finish good / manufacturing only
+    #         cost = self.product_id.standard_price
+    #         self.purchase_price = cost
+    #     elif self.product_id.x_manufacture.override_vendor_id:
+    #         # purchase_price = self.env['purchase.pricelist'].search(
+    #         #     [('vendor_id', '=', self.product_id.x_manufacture.override_vendor_id.id),
+    #         #      ('product_id', '=', self.product_id.id)],
+    #         #     limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
+    #         price, taxes, vendor_id = self._get_purchase_price_by_vendor(self.product_id, self.vendor_id)
+    #         self.purchase_price = price
+    #         self.purchase_tax_id = taxes
+    #     # else:
+    #     # purchase_price = self.env['purchase.pricelist'].search(
+    #     #     [('vendor_id', '=', self.vendor_id.id), ('product_id', '=', self.product_id.id)],
+    #     #     limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
+    #     # price, taxes = self._get_valid_purchase_price(purchase_price)
+    #     # self.purchase_price = price
+    #     # self.purchase_tax_id = taxes
 
     # def _calculate_selling_price(self):
     #     rec_purchase_price, rec_taxes, rec_vendor_id = self._get_purchase_price(self.product_id)
@@ -512,3 +512,19 @@ class SaleOrderLine(models.Model):
             else:
                 line.product_updatable = False
                 # line.desc_updatable = False
+
+    @api.onchange('vendor_id')
+    def _onchange_vendor_id_custom(self):
+        self._update_purchase_info()
+
+    def _update_purchase_info(self):
+        if not self.product_id or self.product_id.type == 'service':
+            return
+
+        if self.product_id.categ_id.id == 34:
+            self.purchase_price = self.product_id.standard_price
+            self.purchase_tax_id = [(5, 0, 0)]  # reset
+        elif self.product_id.x_manufacture.override_vendor_id:
+            price, taxes, vendor_id = self._get_purchase_price_by_vendor(self.product_id, self.vendor_id)
+            self.purchase_price = price
+            self.purchase_tax_id = taxes
-- 
cgit v1.2.3


From 724d7ed6d85ecc3acadbcf56a98aead0512af01d Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 14 Oct 2025 14:11:18 +0700
Subject: push

---
 indoteknik_custom/models/partial_delivery.py | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/indoteknik_custom/models/partial_delivery.py b/indoteknik_custom/models/partial_delivery.py
index 83fe9981..977cceed 100644
--- a/indoteknik_custom/models/partial_delivery.py
+++ b/indoteknik_custom/models/partial_delivery.py
@@ -46,7 +46,6 @@ class PartialDeliveryWizard(models.TransientModel):
             raise UserError(_("Tidak ada produk yang dipilih."))
         for line in self.line_ids:
             line.selected = True
-        # return action supaya wizard gak nutup
         return {
             'type': 'ir.actions.act_window',
             'res_model': self._name,
@@ -60,7 +59,6 @@ class PartialDeliveryWizard(models.TransientModel):
             raise UserError(_("Tidak ada produk yang dipilih."))
         for line in self.line_ids:
             line.selected = False
-        # juga reload biar tetap di wizard
         return {
             'type': 'ir.actions.act_window',
             'res_model': self._name,
@@ -76,7 +74,6 @@ class PartialDeliveryWizard(models.TransientModel):
             self.line_ids = [(5, 0, 0)]
             return
 
-        # 🧹 hapus line lama dulu
         if self.line_ids:
             self.line_ids.unlink()
 
@@ -95,7 +92,7 @@ class PartialDeliveryWizard(models.TransientModel):
                 'wizard_id': self.id,
                 'product_id': move.product_id.id,
                 'reserved_qty': reserved_qty,
-                'selected_qty': reserved_qty,  # biar langsung keisi default
+                # 'selected_qty': reserved_qty,
                 'move_id': move.id,
                 'sale_line_id': move.sale_line_id.id if move.sale_line_id else False,
             })
@@ -119,12 +116,11 @@ class PartialDeliveryWizard(models.TransientModel):
 
         lines_by_qty = self.line_ids.filtered(lambda l: l.selected_qty > 0)
         lines_by_selected = self.line_ids.filtered(lambda l: l.selected and not l.selected_qty)
-        selected_lines = lines_by_qty | lines_by_selected  # gabung dua domain hasil filter
+        selected_lines = lines_by_qty | lines_by_selected 
 
         if not selected_lines:
             raise UserError(_("Tidak ada produk yang dipilih atau diisi jumlahnya."))
 
-        # 🧠 Tambahan: kalau semua line dipilih (full delivery)
         all_selected = len(selected_lines) == len(self.line_ids)
         full_selected = all_selected and all(
             (line.selected_qty or line.reserved_qty) >= line.reserved_qty
@@ -132,10 +128,8 @@ class PartialDeliveryWizard(models.TransientModel):
         )
 
         if full_selected:
-            # 💡 Gak perlu bikin picking baru, langsung ubah state_reserve
             picking.write({'state_reserve': 'partial'})
 
-            # Tambahin log aja biar ada jejak
             picking.message_post(
                 body=f"<b>Full Picking Confirmed</b> dari wizard partial delivery oleh {self.env.user.name}",
                 message_type="comment",
@@ -171,11 +165,9 @@ class PartialDeliveryWizard(models.TransientModel):
             move = line.move_id
             move._do_unreserve()
 
-            # kalau cuma selected tanpa isi qty, otomatis set selected_qty = reserved_qty
             if line.selected and not line.selected_qty:
                 line.selected_qty = line.reserved_qty
 
-            # MODE 1 → Prioritas kalau ada selected_qty
             if line.selected_qty > 0:
                 if line.selected_qty > move.product_uom_qty:
                     raise UserError(_(
@@ -184,7 +176,6 @@ class PartialDeliveryWizard(models.TransientModel):
 
                 if line.selected_qty < move.product_uom_qty:
                     qty_to_keep = move.product_uom_qty - line.selected_qty
-                    # split move
                     new_move = move.copy(default={
                         'product_uom_qty': line.selected_qty,
                         'picking_id': new_picking.id,
@@ -192,19 +183,13 @@ class PartialDeliveryWizard(models.TransientModel):
                     })
                     move.write({'product_uom_qty': qty_to_keep})
                 else:
-                    # full pindah
                     move.write({'picking_id': new_picking.id, 'partial': True})
 
-
-
-        # Confirm & assign DO baru
         new_picking.action_confirm()
         new_picking.action_assign()
 
-        # Reassign DO lama biar sisa qty ke-update
         picking.action_assign()
 
-        # --- 🔢 Rename picking baru dengan format "/(Nomor urut)" ---
         existing_partials = self.env['stock.picking'].search([
             ('origin', '=', picking.origin),
             ('state_reserve', '=', 'partial'),
@@ -220,7 +205,6 @@ class PartialDeliveryWizard(models.TransientModel):
         new_name = f"{picking.name}/{suffix_number}"
         new_picking.name = new_name
 
-        # --- 💬 Post message ke SO ---
         if picking.origin:
             sale_order = self.env['sale.order'].search([('name', '=', picking.origin)], limit=1)
             if sale_order:
@@ -231,7 +215,6 @@ class PartialDeliveryWizard(models.TransientModel):
                     subtype_xmlid="mail.mt_note",
                 )
 
-        # --- 📝 Log di DO baru ---
         new_picking.message_post(
             body=f"<b>Partial Picking created</b> dari {picking.name} oleh {self.env.user.name}",
             message_type="comment",
-- 
cgit v1.2.3


From b41c2d160e5e114bf805baed573d791fbac3feac Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 14 Oct 2025 14:12:23 +0700
Subject: push

---
 indoteknik_custom/models/partial_delivery.py | 37 ++++++++++++++--------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/indoteknik_custom/models/partial_delivery.py b/indoteknik_custom/models/partial_delivery.py
index 977cceed..4df7da1e 100644
--- a/indoteknik_custom/models/partial_delivery.py
+++ b/indoteknik_custom/models/partial_delivery.py
@@ -116,22 +116,31 @@ class PartialDeliveryWizard(models.TransientModel):
 
         lines_by_qty = self.line_ids.filtered(lambda l: l.selected_qty > 0)
         lines_by_selected = self.line_ids.filtered(lambda l: l.selected and not l.selected_qty)
-        selected_lines = lines_by_qty | lines_by_selected 
+        selected_lines = lines_by_qty | lines_by_selected  # gabung dua domain hasil filter
 
         if not selected_lines:
             raise UserError(_("Tidak ada produk yang dipilih atau diisi jumlahnya."))
 
-        all_selected = len(selected_lines) == len(self.line_ids)
-        full_selected = all_selected and all(
-            (line.selected_qty or line.reserved_qty) >= line.reserved_qty
-            for line in selected_lines
+        # 🧠 Cek apakah semua move di DO sudah muncul di wizard dan semua dipilih
+        picking_move_ids = picking.move_ids_without_package.ids
+        wizard_move_ids = self.line_ids.mapped('move_id').ids
+
+        # Semua move DO muncul di wizard, dan semua baris dipilih
+        full_selected = (
+            set(picking_move_ids) == set(wizard_move_ids)
+            and len(selected_lines) == len(self.line_ids)
+            and all(
+                (line.selected_qty or line.reserved_qty) >= line.reserved_qty
+                for line in selected_lines
+            )
         )
 
         if full_selected:
+            # 💡 Gak perlu bikin picking baru, langsung ubah state_reserve
             picking.write({'state_reserve': 'partial'})
 
             picking.message_post(
-                body=f"<b>Full Picking Confirmed</b> dari wizard partial delivery oleh {self.env.user.name}",
+                body=f"<b>Full Picking Confirmed</b> via wizard partial delivery oleh {self.env.user.name} (tanpa DO baru)",
                 message_type="comment",
                 subtype_xmlid="mail.mt_note",
             )
@@ -144,11 +153,12 @@ class PartialDeliveryWizard(models.TransientModel):
                 "target": "current",
                 "effect": {
                     "fadeout": "slow",
-                    "message": f"✅ Semua produk dikirim penuh — tidak dibuat DO baru.",
+                    "message": f"✅ Semua produk dari DO ini dikirim penuh — tidak dibuat DO baru.",
                     "type": "rainbow_man",
                 },
             }
 
+        # 🧩 Kalau bukan full selected, lanjut bikin DO baru
         new_picking = StockPicking.create({
             'origin': picking.origin,
             'partner_id': picking.partner_id.id,
@@ -187,7 +197,6 @@ class PartialDeliveryWizard(models.TransientModel):
 
         new_picking.action_confirm()
         new_picking.action_assign()
-
         picking.action_assign()
 
         existing_partials = self.env['stock.picking'].search([
@@ -196,14 +205,8 @@ class PartialDeliveryWizard(models.TransientModel):
             ('id', '!=', new_picking.id),
         ], order='name asc')
 
-        suffix_number = len(existing_partials)
-        if suffix_number == 0:
-            suffix_number = 1
-        else:
-            suffix_number += 1
-
-        new_name = f"{picking.name}/{suffix_number}"
-        new_picking.name = new_name
+        suffix_number = len(existing_partials) + 1
+        new_picking.name = f"{picking.name}/{suffix_number}"
 
         if picking.origin:
             sale_order = self.env['sale.order'].search([('name', '=', picking.origin)], limit=1)
@@ -234,8 +237,6 @@ class PartialDeliveryWizard(models.TransientModel):
             },
         }
 
-
-
 class PartialDeliveryWizardLine(models.TransientModel):
     _name = 'partial.delivery.wizard.line'
     _description = 'Partial Delivery Wizard Line'
-- 
cgit v1.2.3


From 5a181ec0100dcb7ad5742f757195599deffa2b29 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 14 Oct 2025 21:20:57 +0700
Subject: <miqdad> make move line to get uom from so line

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

diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index b7db8775..1da2befe 100644
--- a/indoteknik_custom/models/stock_move.py
+++ b/indoteknik_custom/models/stock_move.py
@@ -21,6 +21,14 @@ class StockMove(models.Model):
     product_image = fields.Binary(related="product_id.image_128", string="Product Image", readonly=True)
     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_create_multi
     # def create(self, vals_list):
     #     moves = super(StockMove, self).create(vals_list)
@@ -178,3 +186,12 @@ 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)
+
+    # 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
-- 
cgit v1.2.3


From 4502ebb5452b150b5e36175bb7900bace760e9f4 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 15 Oct 2025 09:38:46 +0700
Subject: push fix bug

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

diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index f8fb898c..12e7e6f9 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -523,7 +523,7 @@ class SaleOrderLine(models.Model):
 
         if self.product_id.categ_id.id == 34:
             self.purchase_price = self.product_id.standard_price
-            self.purchase_tax_id = [(5, 0, 0)]  # reset
+            self.purchase_tax_id = False  # reset
         elif self.product_id.x_manufacture.override_vendor_id:
             price, taxes, vendor_id = self._get_purchase_price_by_vendor(self.product_id, self.vendor_id)
             self.purchase_price = price
-- 
cgit v1.2.3


From b6bf4c8b58b9311c6a6cf7f745cb42b025159759 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 15 Oct 2025 12:08:34 +0700
Subject: <Miqdad> SO line onchange vendor id

---
 indoteknik_custom/models/sale_order.py      | 18 +++++------
 indoteknik_custom/models/sale_order_line.py | 46 ++++++++++++++---------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 3bd1ca59..a5e2f7c4 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -3230,10 +3230,10 @@ class SaleOrder(models.Model):
         # order._auto_set_shipping_from_website()
         order._compute_etrts_date()
         order._validate_expected_ready_ship_date()
-        for line in order.order_line:
-            updated_vals = line._update_purchase_info()
-            if updated_vals:
-                line.write(updated_vals)
+        # for line in order.order_line:
+        #     updated_vals = line._update_purchase_info()
+        #     if updated_vals:
+        #         line.write(updated_vals)
         # order._validate_delivery_amt()
         # order._check_total_margin_excl_third_party()
         # order._update_partner_details()
@@ -3365,11 +3365,11 @@ class SaleOrder(models.Model):
         if any(field in vals for field in ["order_line", "client_order_ref"]):
             self._calculate_etrts_date()
 
-        for order in self:
-            for line in order.order_line:
-                updated_vals = line._update_purchase_info()
-                if updated_vals:
-                    line.write(updated_vals)
+        # for order in self:
+        #     for line in order.order_line:
+        #         updated_vals = line._update_purchase_info()
+        #         if updated_vals:
+        #             line.write(updated_vals)
 
         return res
     
diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index 12e7e6f9..bd2600ae 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -247,29 +247,29 @@ class SaleOrderLine(models.Model):
             margin_per_item = sales_price - purchase_price
             line.item_before_margin = margin_per_item
 
-    # @api.onchange('vendor_id')
-    # def onchange_vendor_id(self):
-    #     # TODO : need to change this logic @stephan
-    #     if not self.product_id or self.product_id.type == 'service':
-    #         return
-    #     elif self.product_id.categ_id.id == 34:  # finish good / manufacturing only
-    #         cost = self.product_id.standard_price
-    #         self.purchase_price = cost
-    #     elif self.product_id.x_manufacture.override_vendor_id:
-    #         # purchase_price = self.env['purchase.pricelist'].search(
-    #         #     [('vendor_id', '=', self.product_id.x_manufacture.override_vendor_id.id),
-    #         #      ('product_id', '=', self.product_id.id)],
-    #         #     limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
-    #         price, taxes, vendor_id = self._get_purchase_price_by_vendor(self.product_id, self.vendor_id)
-    #         self.purchase_price = price
-    #         self.purchase_tax_id = taxes
-    #     # else:
-    #     # purchase_price = self.env['purchase.pricelist'].search(
-    #     #     [('vendor_id', '=', self.vendor_id.id), ('product_id', '=', self.product_id.id)],
-    #     #     limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
-    #     # price, taxes = self._get_valid_purchase_price(purchase_price)
-    #     # self.purchase_price = price
-    #     # self.purchase_tax_id = taxes
+    @api.onchange('vendor_id')
+    def onchange_vendor_id(self):
+        # TODO : need to change this logic @stephan
+        if not self.product_id or self.product_id.type == 'service':
+            return
+        elif self.product_id.categ_id.id == 34:  # finish good / manufacturing only
+            cost = self.product_id.standard_price
+            self.purchase_price = cost
+        elif self.product_id.x_manufacture.override_vendor_id:
+            # purchase_price = self.env['purchase.pricelist'].search(
+            #     [('vendor_id', '=', self.product_id.x_manufacture.override_vendor_id.id),
+            #      ('product_id', '=', self.product_id.id)],
+            #     limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
+            price, taxes, vendor_id = self._get_purchase_price_by_vendor(self.product_id, self.vendor_id)
+            self.purchase_price = price
+            self.purchase_tax_id = taxes
+        # else:
+        # purchase_price = self.env['purchase.pricelist'].search(
+        #     [('vendor_id', '=', self.vendor_id.id), ('product_id', '=', self.product_id.id)],
+        #     limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
+        # price, taxes = self._get_valid_purchase_price(purchase_price)
+        # self.purchase_price = price
+        # self.purchase_tax_id = taxes
 
     # def _calculate_selling_price(self):
     #     rec_purchase_price, rec_taxes, rec_vendor_id = self._get_purchase_price(self.product_id)
-- 
cgit v1.2.3


From ee6d5d4433a397ca5cdf3474f29bcbd0b2553736 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 15 Oct 2025 12:18:34 +0700
Subject: <Miqdad> SO line onchange vendor id

---
 indoteknik_custom/models/sale_order_line.py | 48 ++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index bd2600ae..1df1a058 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -247,29 +247,29 @@ class SaleOrderLine(models.Model):
             margin_per_item = sales_price - purchase_price
             line.item_before_margin = margin_per_item
 
-    @api.onchange('vendor_id')
-    def onchange_vendor_id(self):
-        # TODO : need to change this logic @stephan
-        if not self.product_id or self.product_id.type == 'service':
-            return
-        elif self.product_id.categ_id.id == 34:  # finish good / manufacturing only
-            cost = self.product_id.standard_price
-            self.purchase_price = cost
-        elif self.product_id.x_manufacture.override_vendor_id:
-            # purchase_price = self.env['purchase.pricelist'].search(
-            #     [('vendor_id', '=', self.product_id.x_manufacture.override_vendor_id.id),
-            #      ('product_id', '=', self.product_id.id)],
-            #     limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
-            price, taxes, vendor_id = self._get_purchase_price_by_vendor(self.product_id, self.vendor_id)
-            self.purchase_price = price
-            self.purchase_tax_id = taxes
-        # else:
-        # purchase_price = self.env['purchase.pricelist'].search(
-        #     [('vendor_id', '=', self.vendor_id.id), ('product_id', '=', self.product_id.id)],
-        #     limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
-        # price, taxes = self._get_valid_purchase_price(purchase_price)
-        # self.purchase_price = price
-        # self.purchase_tax_id = taxes
+    # @api.onchange('vendor_id')
+    # def onchange_vendor_id(self):
+    #     # TODO : need to change this logic @stephan
+    #     if not self.product_id or self.product_id.type == 'service':
+    #         return
+    #     elif self.product_id.categ_id.id == 34:  # finish good / manufacturing only
+    #         cost = self.product_id.standard_price
+    #         self.purchase_price = cost
+    #     elif self.product_id.x_manufacture.override_vendor_id:
+    #         # purchase_price = self.env['purchase.pricelist'].search(
+    #         #     [('vendor_id', '=', self.product_id.x_manufacture.override_vendor_id.id),
+    #         #      ('product_id', '=', self.product_id.id)],
+    #         #     limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
+    #         price, taxes, vendor_id = self._get_purchase_price_by_vendor(self.product_id, self.vendor_id)
+    #         self.purchase_price = price
+    #         self.purchase_tax_id = taxes
+    #     # else:
+    #     # purchase_price = self.env['purchase.pricelist'].search(
+    #     #     [('vendor_id', '=', self.vendor_id.id), ('product_id', '=', self.product_id.id)],
+    #     #     limit=1, order='count_trx_po desc, count_trx_po_vendor desc')
+    #     # price, taxes = self._get_valid_purchase_price(purchase_price)
+    #     # self.purchase_price = price
+    #     # self.purchase_tax_id = taxes
 
     # def _calculate_selling_price(self):
     #     rec_purchase_price, rec_taxes, rec_vendor_id = self._get_purchase_price(self.product_id)
@@ -523,7 +523,7 @@ class SaleOrderLine(models.Model):
 
         if self.product_id.categ_id.id == 34:
             self.purchase_price = self.product_id.standard_price
-            self.purchase_tax_id = False  # reset
+            self.purchase_tax_id = False
         elif self.product_id.x_manufacture.override_vendor_id:
             price, taxes, vendor_id = self._get_purchase_price_by_vendor(self.product_id, self.vendor_id)
             self.purchase_price = price
-- 
cgit v1.2.3


From b3eab8f1694e5fa1b8229784d247f437f68c2b4c Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 16 Oct 2025 08:46:23 +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 1da2befe..163c7505 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):
@@ -188,10 +188,10 @@ class StockMoveLine(models.Model):
     manufacture = fields.Many2one('x_manufactures', string="Brands", related="product_id.x_manufacture", store=True)
 
     # 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 efaeb9e53727f6ccfa0c42bbf8a7c7cc0f25da4b Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 16 Oct 2025 08:50:57 +0700
Subject: <Miqdad> fix api

---
 indoteknik_api/controllers/api_v1/sale_order.py |  2 +-
 indoteknik_custom/models/stock_move.py          | 26 ++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 741dc0b1..cff1921d 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -789,7 +789,7 @@ class SaleOrder(controller.Controller):
 
                     order_line.product_id_change()
                     order_line.weight = order_line.product_id.weight
-                    order_line.onchange_vendor_id()
+                    order_line._onchange_vendor_id_custom()
                     _logger.info(f"After onchanges - Price: {order_line.price_unit}, Disc: {order_line.discount}")
 
                 elif cart['cart_type'] == 'promotion':
diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index 163c7505..1da2befe 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):
@@ -188,10 +188,10 @@ class StockMoveLine(models.Model):
     manufacture = fields.Many2one('x_manufactures', string="Brands", related="product_id.x_manufacture", store=True)
 
     # 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 7abcc2bd055eecea8caacae8187b7dacff671c46 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 16 Oct 2025 10:46:15 +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 b34ec926..672db7cf 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1354,7 +1354,7 @@ class PurchaseOrder(models.Model):
         for rec in self:
             if rec.from_apo:
                 rec.compute_total_margin_from_apo()
-                return
+                continue
             
         sum_so_margin = sum_sales_price = sum_margin = 0
         for line in self.order_line:
-- 
cgit v1.2.3


From 8ff0270ee40b34d8eb85cd8d5e9572211a0e36a9 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 16 Oct 2025 11:52:52 +0700
Subject: (andri) off check po manual confirm

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

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 1a88d036..f8718a0d 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1072,15 +1072,15 @@ class PurchaseOrder(models.Model):
         if self.env.user.id != 7: # Pimpinan
             if '/PJ/' in self.name:
                 low_margin_lines = self.order_sales_match_line.filtered(
-                    lambda match: match.so_header_margin <= 34.0
+                    lambda match: match.so_header_margin <= 15.0
                 )
                 if low_margin_lines:
                     raise UserError("Matches SO terdapat item dengan header margin SO <= 15%. Approval Pimpinan diperlukan.")
-            else:
-                is_po_manual = '/A/' not in self.name and '/MO/' not in self.name
-                if is_po_manual:
-                    if not self.order_sales_match_line:
-                        raise UserError("Tidak ada matches SO, Approval Pimpinan diperlukan.")
+            # else:
+            #     is_po_manual = '/A/' not in self.name and '/MO/' not in self.name
+            #     if is_po_manual:
+            #         if not self.order_sales_match_line:
+            #             raise UserError("Tidak ada matches SO, Approval Pimpinan diperlukan.")
 
         self._check_assets_note() 
         # self._check_payment_term() # check payment term 
-- 
cgit v1.2.3


From e210b6fa5ec6603920f550e5f8cc64e32e832e44 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 16 Oct 2025 12:01:20 +0700
Subject: (andri) fix

---
 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 f8718a0d..7badff95 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1069,7 +1069,7 @@ class PurchaseOrder(models.Model):
                 ) % order.name)
                 
     def button_confirm(self):
-        if self.env.user.id != 7: # Pimpinan
+        if self.env.user.id != 7 and not self.env.user.is_leader: # Pimpinan
             if '/PJ/' in self.name:
                 low_margin_lines = self.order_sales_match_line.filtered(
                     lambda match: match.so_header_margin <= 15.0
-- 
cgit v1.2.3


From bd0cc0fa2518e735cbe766bd0ea3726c63d3ebbd Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Fri, 17 Oct 2025 11:08:26 +0700
Subject: (andri) off validasi approval matches SO

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

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index b596f365..a1c3c0c4 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1069,13 +1069,13 @@ class PurchaseOrder(models.Model):
                 ) % order.name)
                 
     def button_confirm(self):
-        if self.env.user.id != 7 and not self.env.user.is_leader: # Pimpinan
-            if '/PJ/' in self.name:
-                low_margin_lines = self.order_sales_match_line.filtered(
-                    lambda match: match.so_header_margin <= 15.0
-                )
-                if low_margin_lines:
-                    raise UserError("Matches SO terdapat item dengan header margin SO <= 15%. Approval Pimpinan diperlukan.")
+        # if self.env.user.id != 7 and not self.env.user.is_leader: # Pimpinan
+        #     if '/PJ/' in self.name:
+        #         low_margin_lines = self.order_sales_match_line.filtered(
+        #             lambda match: match.so_header_margin <= 15.0
+        #         )
+        #         if low_margin_lines:
+        #             raise UserError("Matches SO terdapat item dengan header margin SO <= 15%. Approval Pimpinan diperlukan.")
             # else:
             #     is_po_manual = '/A/' not in self.name and '/MO/' not in self.name
             #     if is_po_manual:
-- 
cgit v1.2.3


From 7ba88682ecb9d1445f5565723adaf93106e056e2 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Fri, 17 Oct 2025 11:10:33 +0700
Subject: (andri) on

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

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index a1c3c0c4..b596f365 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1069,13 +1069,13 @@ class PurchaseOrder(models.Model):
                 ) % order.name)
                 
     def button_confirm(self):
-        # if self.env.user.id != 7 and not self.env.user.is_leader: # Pimpinan
-        #     if '/PJ/' in self.name:
-        #         low_margin_lines = self.order_sales_match_line.filtered(
-        #             lambda match: match.so_header_margin <= 15.0
-        #         )
-        #         if low_margin_lines:
-        #             raise UserError("Matches SO terdapat item dengan header margin SO <= 15%. Approval Pimpinan diperlukan.")
+        if self.env.user.id != 7 and not self.env.user.is_leader: # Pimpinan
+            if '/PJ/' in self.name:
+                low_margin_lines = self.order_sales_match_line.filtered(
+                    lambda match: match.so_header_margin <= 15.0
+                )
+                if low_margin_lines:
+                    raise UserError("Matches SO terdapat item dengan header margin SO <= 15%. Approval Pimpinan diperlukan.")
             # else:
             #     is_po_manual = '/A/' not in self.name and '/MO/' not in self.name
             #     if is_po_manual:
-- 
cgit v1.2.3


From 66983246c83db072c62abba4a40a70e514b081d0 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Fri, 17 Oct 2025 13:40:39 +0700
Subject: (andri) fix

---
 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 b596f365..701c0a3f 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1090,7 +1090,7 @@ class PurchaseOrder(models.Model):
         self.check_different_vendor_so_po()
         # self.check_data_vendor()
 
-        if self.amount_untaxed >= 50000000 and not self.env.user.id == 21:
+        if self.amount_untaxed >= 50000000 and not self.env.user.id in (21, 7):
             raise UserError("Hanya Rafly Hanggara yang bisa approve")
 
         if not self.date_planned:
-- 
cgit v1.2.3


From a850dd693d4342181cfe4ca15fcd5ff4a528dcc4 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 17 Oct 2025 14:26:06 +0700
Subject: push

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

diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index 6d538b83..a937e2d0 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -428,22 +428,22 @@ class CustomerCommision(models.Model):
 
         if not self.status or self.status == 'draft':
             self.status = 'pengajuan1'
-        elif self.status == 'pengajuan1' and self.env.user.id == 19:
+        elif self.status == 'pengajuan1' and (self.env.user.id == 19 or self.env.user.has_group('indoteknik_custom.group_role_it')):
             self.status = 'pengajuan2'
             self.approved_by = (self.approved_by + ', ' if self.approved_by else '') + self.env.user.name
             self.date_approved_sales = now_naive
             self.position_sales = 'Sales Manager'
-        elif self.status == 'pengajuan2' and self.env.user.id == 216:
+        elif self.status == 'pengajuan2' and (self.env.user.id == 216 or self.env.user.has_group('indoteknik_custom.group_role_it')):
             self.status = 'pengajuan3'
             self.approved_by = (self.approved_by + ', ' if self.approved_by else '') + self.env.user.name
             self.date_approved_marketing = now_naive
             self.position_marketing = 'Marketing Manager'
-        elif self.status == 'pengajuan3' and self.env.user.is_leader:
+        elif self.status == 'pengajuan3' and (self.env.user.is_leader or self.env.user.has_group('indoteknik_custom.group_role_it')):
             self.status = 'pengajuan4'
             self.approved_by = (self.approved_by + ', ' if self.approved_by else '') + self.env.user.name
             self.date_approved_pimpinan = now_naive
             self.position_pimpinan = 'Pimpinan'
-        elif self.status == 'pengajuan4' and self.env.user.id == 1272:
+        elif self.status == 'pengajuan4' and (self.env.user.id == 1272 or self.env.user.has_group('indoteknik_custom.group_role_it')):
             for line in self.commision_lines:
                 line.invoice_id.is_customer_commision = True
             if self.commision_type == 'fee':
-- 
cgit v1.2.3


From 2cd0d5ede34e2c46b3bcd1f1907cd0526ef42b9d Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Fri, 17 Oct 2025 15:45:48 +0700
Subject: (andri) butuh approval pimpinan bila ada perubahan unit price pada PO
 PJ + matches SO margin header <=15%

---
 indoteknik_custom/models/purchase_order.py      | 6 ++++--
 indoteknik_custom/models/purchase_order_line.py | 6 ++++++
 indoteknik_custom/views/purchase_order.xml      | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 701c0a3f..51517437 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1074,8 +1074,10 @@ class PurchaseOrder(models.Model):
                 low_margin_lines = self.order_sales_match_line.filtered(
                     lambda match: match.so_header_margin <= 15.0
                 )
-                if low_margin_lines:
-                    raise UserError("Matches SO terdapat item dengan header margin SO <= 15%. Approval Pimpinan diperlukan.")
+                price_change_detected = any(line.price_unit_before for line in self.order_line)
+                if low_margin_lines and price_change_detected:
+                    # raise UserError("Matches SO terdapat item dengan header margin SO <= 15%. Approval Pimpinan diperlukan.")
+                    raise UserError("Approval Pimpinan diperlukan jika terdapat perubahan Unit Price pada PO Line yang Matches SO item memiliki header margin SO <= 15%")
             # else:
             #     is_po_manual = '/A/' not in self.name and '/MO/' not in self.name
             #     if is_po_manual:
diff --git a/indoteknik_custom/models/purchase_order_line.py b/indoteknik_custom/models/purchase_order_line.py
index a3c3a33b..8c72887d 100755
--- a/indoteknik_custom/models/purchase_order_line.py
+++ b/indoteknik_custom/models/purchase_order_line.py
@@ -51,6 +51,12 @@ class PurchaseOrderLine(models.Model):
     contribution_cost_service = fields.Float(string='Contribution Cost Service', compute='_compute_doc_delivery_amt')
     ending_price = fields.Float(string='Ending Price', compute='_compute_doc_delivery_amt')
     show_description = fields.Boolean(string='Show Description', help="Show Description when print po", default=True)
+    price_unit_before = fields.Float(string='Unit Price Before', help="Harga awal yang sebelumnya telah diinputkan")
+
+    @api.onchange('price_unit')
+    def _onchange_price_unit_before(self):
+        if self._origin:
+            self.price_unit_before = self._origin.price_unit
 
     def _compute_doc_delivery_amt(self):
         for line in self:
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 437b86b8..09d901b9 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -144,6 +144,7 @@
                     <field name="cost_service_per_item" optional="hide"/>
                     <field name="contribution_cost_service" optional="hide"/>
                     <field name="ending_price" optional="hide"/>
+                    <field name="price_unit_before" readonly="1" optional="hide" force_save="1"/>
                 <!-- <field name="suggest" readonly="1"/> -->
                 </field>
                 <field name="product_id" position="before">
-- 
cgit v1.2.3


From 2a61388ec5938888710d7c15f660f19ed55def51 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Sat, 18 Oct 2025 11:27:24 +0700
Subject: push

---
 indoteknik_custom/models/purchase_order.py | 51 +++++++++++-------------------
 1 file changed, 19 insertions(+), 32 deletions(-)

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 51517437..7fc038a0 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1420,63 +1420,50 @@ class PurchaseOrder(models.Model):
                 ('product_id', '=', line.product_id.id),
                 ('order_id', '=', line.purchase_order_id.id)
             ], limit=1)
-            sale_order_line = line.sale_line_id
-            if not sale_order_line:
-                sale_order_line = self.env['sale.order.line'].search([
-                    ('product_id', '=', line.product_id.id),
-                    ('order_id', '=', line.sale_id.id)
-                ], limit=1, order='price_reduce_taxexcl')
+            sale_order_line = line.sale_line_id or self.env['sale.order.line'].search([
+                ('product_id', '=', line.product_id.id),
+                ('order_id', '=', line.sale_id.id)
+            ], limit=1, order='price_reduce_taxexcl')
 
             if sale_order_line and po_line:
-                so_margin = (line.qty_po / line.qty_so) * sale_order_line.item_margin
+                qty_so = line.qty_so or 0
+                qty_po = line.qty_po or 0
+
+                # Hindari division by zero
+                so_margin = (qty_po / qty_so) * sale_order_line.item_margin if qty_so > 0 else 0
                 sum_so_margin += so_margin
 
-                sales_price = sale_order_line.price_reduce_taxexcl * line.qty_po
+                sales_price = sale_order_line.price_reduce_taxexcl * qty_po
                 if sale_order_line.order_id.shipping_cost_covered == 'indoteknik':
-                    sales_price -= (sale_order_line.delivery_amt_line / sale_order_line.product_uom_qty) * line.qty_po
+                    sales_price -= (sale_order_line.delivery_amt_line / sale_order_line.product_uom_qty) * qty_po
                 if sale_order_line.order_id.fee_third_party > 0:
-                    sales_price -= (sale_order_line.fee_third_party_line / sale_order_line.product_uom_qty) * line.qty_po
+                    sales_price -= (sale_order_line.fee_third_party_line / sale_order_line.product_uom_qty) * qty_po
                 sum_sales_price += sales_price
 
-                
                 purchase_price = po_line.price_subtotal
                 if po_line.ending_price > 0:
                     if po_line.taxes_id.id == 22:
-                        ending_price = po_line.ending_price / 1.11
-                        purchase_price = ending_price
+                        purchase_price = po_line.ending_price / 1.11
                     else:
                         purchase_price = po_line.ending_price
                 if line.purchase_order_id.delivery_amount > 0:
-                    purchase_price += (po_line.delivery_amt_line / po_line.product_qty) * line.qty_po
+                    purchase_price += (po_line.delivery_amt_line / po_line.product_qty) * qty_po
                 if line.purchase_order_id.delivery_amt > 0:
                     purchase_price += line.purchase_order_id.delivery_amt
+
                 real_item_margin = sales_price - purchase_price
                 sum_margin += real_item_margin
 
-        if sum_so_margin != 0 and sum_sales_price != 0 and sum_margin != 0:
+        # Akumulasi hasil akhir
+        if sum_sales_price != 0:
             self.total_so_margin = sum_so_margin
             self.total_so_percent_margin = round((sum_so_margin / sum_sales_price), 2) * 100
             self.total_margin = sum_margin
             self.total_percent_margin = round((sum_margin / sum_sales_price), 2) * 100
-
         else:
-            self.total_margin = 0
-            self.total_percent_margin = 0
-            self.total_so_margin = 0
-            self.total_so_percent_margin = 0
-                
+            self.total_margin = self.total_percent_margin = 0
+            self.total_so_margin = self.total_so_percent_margin = 0
 
-        if sum_so_margin != 0 and sum_sales_price != 0 and sum_margin != 0:
-            self.total_so_margin = sum_so_margin
-            self.total_so_percent_margin = round((sum_so_margin / sum_sales_price), 2) * 100
-            self.total_margin = sum_margin
-            self.total_percent_margin = round((sum_margin / sum_sales_price), 2) * 100
-
-        else:
-            self.total_margin = 0
-            self.total_percent_margin = 0
-            self.total_so_margin = 0
-            self.total_so_percent_margin = 0
 
     def compute_amt_total_without_service(self):
         for order in self:
-- 
cgit v1.2.3


From 29b3ec084ed1791330551c5de34f045565eef6f1 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Mon, 20 Oct 2025 13:18:14 +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 7fc038a0..e79417aa 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1369,7 +1369,7 @@ class PurchaseOrder(models.Model):
         for rec in self:
             if rec.from_apo:
                 rec.compute_total_margin_from_apo()
-                continue
+                return
             
         sum_so_margin = sum_sales_price = sum_margin = 0
         for line in self.order_line:
-- 
cgit v1.2.3


From da01b745094082f7efd837bef2a796d8dcede50b Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 20 Oct 2025 15:37:57 +0700
Subject: <Miqdad> hilangin validasi sudah pernah diretur ccm

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

diff --git a/indoteknik_custom/models/tukar_guling.py b/indoteknik_custom/models/tukar_guling.py
index cb630a04..cfa0ac77 100644
--- a/indoteknik_custom/models/tukar_guling.py
+++ b/indoteknik_custom/models/tukar_guling.py
@@ -492,14 +492,14 @@ class TukarGuling(models.Model):
         self.ensure_one()
         self._check_not_allow_tukar_guling_on_bu_pick()
 
-        existing_tukar_guling = self.env['tukar.guling'].search([
-            ('operations', '=', self.operations.id),
-            ('id', '!=', self.id),
-            ('state', '!=', 'cancel'),
-        ], limit=1)
-
-        if existing_tukar_guling:
-            raise UserError("BU ini sudah pernah diretur oleh dokumen %s." % existing_tukar_guling.name)
+        # existing_tukar_guling = self.env['tukar.guling'].search([
+        #     ('operations', '=', self.operations.id),
+        #     ('id', '!=', self.id),
+        #     ('state', '!=', 'cancel'),
+        # ], limit=1)
+        #
+        # if existing_tukar_guling:
+        #     raise UserError("BU ini sudah pernah diretur oleh dokumen %s." % existing_tukar_guling.name)
         picking = self.operations
         if picking.picking_type_id.id == 30 and self.return_type == 'tukar_guling':
             raise UserError("❌ BU/PICK tidak boleh di retur tukar guling")
-- 
cgit v1.2.3


From fdf9425e60b8c91ef797f7c7b88baf98f2bd4619 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 20 Oct 2025 19:44:18 +0700
Subject: <Miqdad> balikin validasi CCM

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

diff --git a/indoteknik_custom/models/tukar_guling.py b/indoteknik_custom/models/tukar_guling.py
index cfa0ac77..cb630a04 100644
--- a/indoteknik_custom/models/tukar_guling.py
+++ b/indoteknik_custom/models/tukar_guling.py
@@ -492,14 +492,14 @@ class TukarGuling(models.Model):
         self.ensure_one()
         self._check_not_allow_tukar_guling_on_bu_pick()
 
-        # existing_tukar_guling = self.env['tukar.guling'].search([
-        #     ('operations', '=', self.operations.id),
-        #     ('id', '!=', self.id),
-        #     ('state', '!=', 'cancel'),
-        # ], limit=1)
-        #
-        # if existing_tukar_guling:
-        #     raise UserError("BU ini sudah pernah diretur oleh dokumen %s." % existing_tukar_guling.name)
+        existing_tukar_guling = self.env['tukar.guling'].search([
+            ('operations', '=', self.operations.id),
+            ('id', '!=', self.id),
+            ('state', '!=', 'cancel'),
+        ], limit=1)
+
+        if existing_tukar_guling:
+            raise UserError("BU ini sudah pernah diretur oleh dokumen %s." % existing_tukar_guling.name)
         picking = self.operations
         if picking.picking_type_id.id == 30 and self.return_type == 'tukar_guling':
             raise UserError("❌ BU/PICK tidak boleh di retur tukar guling")
-- 
cgit v1.2.3


From 00f94ec61fad94ed49f646396292228187b50173 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 21 Oct 2025 11:46:47 +0700
Subject: <Miqdad> add asset type in assets

---
 indoteknik_custom/models/account_asset.py       | 4 ++++
 indoteknik_custom/views/account_asset_views.xml | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/indoteknik_custom/models/account_asset.py b/indoteknik_custom/models/account_asset.py
index bd5f9adb..211ab229 100644
--- a/indoteknik_custom/models/account_asset.py
+++ b/indoteknik_custom/models/account_asset.py
@@ -4,6 +4,10 @@ from odoo.exceptions import AccessError, UserError, ValidationError
 
 class AccountAsset(models.Model):
     _inherit = 'account.asset.asset'
+    asset_type = fields.Selection(string='Tipe Aset', selection=[
+        ('aset_gudang', ' Aset Gudang'),
+        ('aset_kantor', 'Aset Kantor'),
+    ], tracking=True )
 
     def action_close_asset(self):
         for asset in self:
diff --git a/indoteknik_custom/views/account_asset_views.xml b/indoteknik_custom/views/account_asset_views.xml
index 90c53623..776ab51f 100644
--- a/indoteknik_custom/views/account_asset_views.xml
+++ b/indoteknik_custom/views/account_asset_views.xml
@@ -12,6 +12,9 @@
                             type="object"
                     />
                 </button>
+                <field name="invoice_id" position="after">
+                    <field name="asset_type"/>
+                </field>
             </field>
         </record>
     </data>
-- 
cgit v1.2.3


From e19f7637f648fb37fc9049ce7898dfc22568bf63 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 22 Oct 2025 09:42:13 +0700
Subject: <Miqdad> fix driver arrival date api for indoteknik delivery

---
 indoteknik_api/controllers/api_v1/stock_picking.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index 2ec1ec2a..9affb492 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -1,5 +1,7 @@
+from adodbapi.apibase import DateTime
+
 from .. import controller
-from odoo import http
+from odoo import http, fields
 from odoo.http import request, Response
 from pytz import timezone
 from datetime import datetime
@@ -140,19 +142,19 @@ class StockPicking(controller.Controller):
         if not picking_data:
             return self.response(code=403, description='picking not found')
 
-        params = {
-            'driver_arrival_date': datetime.utcnow(),
-        }
+        params = {}
         if sj_document:
             params['sj_documentation'] = sj_document
         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)
     def update_status_from_biteship(self, **kw):
         _logger.info("Biteship Webhook: Request received at controller start (type='json').")
-- 
cgit v1.2.3


From a1862d78377710020c40361401af79766ea9ca70 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 22 Oct 2025 11:48:36 +0700
Subject: <Miqdad> fix sj tele message sent multiple chat bubble with same
 message

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

diff --git a/indoteknik_custom/models/sj_tele.py b/indoteknik_custom/models/sj_tele.py
index 3ef4b877..d3d7dfce 100644
--- a/indoteknik_custom/models/sj_tele.py
+++ b/indoteknik_custom/models/sj_tele.py
@@ -18,6 +18,7 @@ class SjTele(models.Model):
     sale_name = fields.Char(string='Sale Name')
     create_date = fields.Datetime(string='Create Date')
     date_doc_kirim = fields.Datetime(string='Tanggal Kirim SJ')
+    is_sent = fields.Boolean(default=False)
 
     def woi(self):
         bot_mqdd = '8203414501:AAHy_XwiUAVrgRM2EJzW7sZx9npRLITZpb8'
@@ -27,7 +28,9 @@ class SjTele(models.Model):
         # chat_id_testing = '-4920864331'
         # api_testing = f'https://api.telegram.org/bot{bot_testing}'
 
-        data = self.search([], order='create_date asc')
+        data = self.search([('is_sent', '=', False)], order='create_date asc')
+        # Old
+        # data = self.search([], order='create_date asc')
 
         if not data:
             text = "✅ tidak ada data (semua sudah tercatat)."
@@ -83,6 +86,9 @@ class SjTele(models.Model):
                 _logger.exception("Gagal kirim Telegram (batch %s-%s): %s", i + 1, min(i + BUB, len(lines)), e)
             time.sleep(5)  # jeda kecil biar rapi & aman rate limit
 
+        # Set sent = true ketika sudah terkirim
+        data.write({'is_sent': True})
+
         return True
 
         # header = "Berikut merupakan nomor BU/OUT yang belum ada di Logbook SJ report:\n"
-- 
cgit v1.2.3


From 9f916d880c5d061ee2ba66a80d26fbca76355054 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 22 Oct 2025 11:49:37 +0700
Subject: <Miqdad> fix sj tele message sent multiple chat bubble with same
 message

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

diff --git a/indoteknik_custom/models/sj_tele.py b/indoteknik_custom/models/sj_tele.py
index d3d7dfce..53ba26fc 100644
--- a/indoteknik_custom/models/sj_tele.py
+++ b/indoteknik_custom/models/sj_tele.py
@@ -28,7 +28,9 @@ class SjTele(models.Model):
         # chat_id_testing = '-4920864331'
         # api_testing = f'https://api.telegram.org/bot{bot_testing}'
 
+        # Select Data
         data = self.search([('is_sent', '=', False)], order='create_date asc')
+
         # Old
         # data = self.search([], order='create_date asc')
 
-- 
cgit v1.2.3


From d3e1c12c5745f95551116723efd64e7a15dd5fc1 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 22 Oct 2025 13:49:38 +0700
Subject: push

---
 indoteknik_custom/models/mrp_production.py |  3 +++
 indoteknik_custom/models/stock_picking.py  | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/indoteknik_custom/models/mrp_production.py b/indoteknik_custom/models/mrp_production.py
index 30956082..02679458 100644
--- a/indoteknik_custom/models/mrp_production.py
+++ b/indoteknik_custom/models/mrp_production.py
@@ -308,6 +308,9 @@ class CheckBomProduct(models.Model):
         if not self.code_product:
             return
         
+        if self.production_id.qty_producing == 0:
+            raise UserError("Isi dan Save dahulu Quantity To Produce yang diinginkan!")
+        
         # Cari product berdasarkan default_code, barcode, atau barcode_box
         product = self.env['product.product'].search([
             '|',
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 4772c433..d6096cc0 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -464,15 +464,15 @@ class StockPicking(models.Model):
 
                 rec.last_update_date_doc_kirim = datetime.datetime.utcnow()
 
-    @api.constrains('scan_koli_lines')
-    def _constrains_scan_koli_lines(self):
-        now = datetime.datetime.utcnow()
-        for picking in self:
-            if len(picking.scan_koli_lines) > 0:
-                if len(picking.scan_koli_lines) != picking.total_mapping_koli:
-                    raise UserError("Scan Koli Tidak Sesuai Dengan Total Mapping Koli")
+    # @api.constrains('scan_koli_lines')
+    # def _constrains_scan_koli_lines(self):
+    #     now = datetime.datetime.utcnow()
+    #     for picking in self:
+    #         if len(picking.scan_koli_lines) > 0:
+    #             if len(picking.scan_koli_lines) != picking.total_mapping_koli:
+    #                 raise UserError("Scan Koli Tidak Sesuai Dengan Total Mapping Koli")
 
-                picking.driver_departure_date = now
+    #             picking.driver_departure_date = now
 
     @api.depends('total_so_koli')
     def _compute_total_so_koli(self):
@@ -1303,6 +1303,9 @@ 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()
 
         # if self.driver_departure_date == False and 'BU/OUT/' in self.name and self.picking_type_code == 'outgoing':
         #     raise UserError(_("Isi Driver Departure Date dulu sebelum validate"))
-- 
cgit v1.2.3


From 6e746afb7fcd7a3762dc7beb27ac3f77a21c7a98 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 22 Oct 2025 13:51:30 +0700
Subject: <Miqdad> fix

---
 indoteknik_api/controllers/api_v1/stock_picking.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index 9affb492..310554c2 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -1,5 +1,3 @@
-from adodbapi.apibase import DateTime
-
 from .. import controller
 from odoo import http, fields
 from odoo.http import request, Response
-- 
cgit v1.2.3


From e65db92c25f8e54773cd1113736005f20799ea2b Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 22 Oct 2025 13:51:45 +0700
Subject: <Miqdad> fix

---
 indoteknik_api/controllers/api_v1/stock_picking.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index 310554c2..20a48886 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -8,7 +8,6 @@ import logging
 
 _logger = logging.getLogger(__name__)
 
-_logger = logging.getLogger(__name__)
 
 class StockPicking(controller.Controller):
     prefix = '/api/v1/'
-- 
cgit v1.2.3


From 7c7519d2031a474901702fdd1c7921389eb44a15 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 22 Oct 2025 16:10:38 +0700
Subject: <Miqdad> get self pickup params from website

---
 indoteknik_api/controllers/api_v1/stock_picking.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index 20a48886..b7ff5690 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -127,6 +127,7 @@ class StockPicking(controller.Controller):
         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
@@ -142,6 +143,8 @@ class StockPicking(controller.Controller):
         params = {}
         if sj_document:
             params['sj_documentation'] = sj_document
+            if params['self_pu']:
+                params['driver_arrival_date'] = datetime.utcnow()
         if paket_document:
             params['paket_documentation'] = paket_document
             params['driver_arrival_date'] = datetime.utcnow()
-- 
cgit v1.2.3


From 8d649f97dade329859b5770d1f3972cdd7233f97 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 22 Oct 2025 16:22:17 +0700
Subject: <Miqdad> get self pickup params from website

---
 indoteknik_api/controllers/api_v1/stock_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py
index b7ff5690..fe82e665 100644
--- a/indoteknik_api/controllers/api_v1/stock_picking.py
+++ b/indoteknik_api/controllers/api_v1/stock_picking.py
@@ -143,7 +143,7 @@ class StockPicking(controller.Controller):
         params = {}
         if sj_document:
             params['sj_documentation'] = sj_document
-            if params['self_pu']:
+            if self_pu:
                 params['driver_arrival_date'] = datetime.utcnow()
         if paket_document:
             params['paket_documentation'] = paket_document
-- 
cgit v1.2.3


From 12f1df2b2dabd0fba5dc0e2584c9a588c378118c Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 23 Oct 2025 16:54:58 +0700
Subject: push maintenance partial delivery wizard

---
 indoteknik_custom/models/sale_order.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index a5e2f7c4..5c8f34c6 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -399,20 +399,21 @@ class SaleOrder(models.Model):
     )
 
     def action_open_partial_delivery_wizard(self):
-        self.ensure_one()
-        pickings = self.picking_ids.filtered(lambda p: p.state not in ['done', 'cancel'] and p.name and 'BU/PICK/' in p.name)
-        return {
-            'type': 'ir.actions.act_window',
-            'name': 'Partial Delivery',
-            'res_model': 'partial.delivery.wizard',
-            'view_mode': 'form',
-            'target': 'new',
-            'context': {
-                'default_sale_id': self.id,
-                # kasih langsung list of int biar ga ribet di wizard
-                'default_picking_ids': pickings.ids,
-            }
-        }
+        raise UserError("Fitur ini sedang dalam pengembangan")
+        # self.ensure_one()
+        # pickings = self.picking_ids.filtered(lambda p: p.state not in ['done', 'cancel'] and p.name and 'BU/PICK/' in p.name)
+        # return {
+        #     'type': 'ir.actions.act_window',
+        #     'name': 'Partial Delivery',
+        #     'res_model': 'partial.delivery.wizard',
+        #     'view_mode': 'form',
+        #     'target': 'new',
+        #     'context': {
+        #         'default_sale_id': self.id,
+        #         # kasih langsung list of int biar ga ribet di wizard
+        #         'default_picking_ids': pickings.ids,
+        #     }
+        # }
 
 
     @api.depends('partner_id.is_cbd_locked')
-- 
cgit v1.2.3


From 4b257da93f1eb1d025303113d6884b22df59c1b4 Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Fri, 24 Oct 2025 11:27:57 +0700
Subject: <hafid> refund barang kurang

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

diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index 47565dfc..e6547a88 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -753,10 +753,11 @@ class RefundSaleOrder(models.Model):
             line_vals = []
             for so in self.sale_order_ids:
                 for line in so.order_line:
-                    if line.qty_delivered == 0:
+                    barang_kurang = line.product_uom_qty - line.qty_delivered
+                    if line.qty_delivered == 0 or barang_kurang > 0:
                         line_vals.append((0, 0, {
                             'product_id': line.product_id.id,
-                            'quantity': line.product_uom_qty,
+                            'quantity': barang_kurang,
                             'from_name': so.name,
                             'prod_id': so.id,
                             'reason': '',
-- 
cgit v1.2.3


From dc57520d3e0fe0bb8a314e1cb4ec4b3648fd8a37 Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Fri, 24 Oct 2025 11:29:00 +0700
Subject: push

---
 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..475f0355 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -754,7 +754,7 @@ class RefundSaleOrder(models.Model):
             for so in self.sale_order_ids:
                 for line in so.order_line:
                     barang_kurang = line.product_uom_qty - line.qty_delivered
-                    if line.qty_delivered == 0 or barang_kurang > 0:
+                    if line.qty_delivered == 0 or barang_kurang >= 0:
                         line_vals.append((0, 0, {
                             'product_id': line.product_id.id,
                             'quantity': barang_kurang,
-- 
cgit v1.2.3


From 64fcfa3daf65c8f5699544ce73d7ec930fa124af Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Fri, 24 Oct 2025 11:35:13 +0700
Subject: push

---
 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 475f0355..e6547a88 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -754,7 +754,7 @@ class RefundSaleOrder(models.Model):
             for so in self.sale_order_ids:
                 for line in so.order_line:
                     barang_kurang = line.product_uom_qty - line.qty_delivered
-                    if line.qty_delivered == 0 or barang_kurang >= 0:
+                    if line.qty_delivered == 0 or barang_kurang > 0:
                         line_vals.append((0, 0, {
                             'product_id': line.product_id.id,
                             'quantity': barang_kurang,
-- 
cgit v1.2.3