From 101948d6029b06a69759b8f246f1744312f035c0 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Fri, 29 Aug 2025 10:52:19 +0700
Subject: (andri) add is locked CBD jika ada customer yang sudah jatuh tempo

---
 indoteknik_custom/models/account_move.py          | 28 +++++++++++++++++++++++
 indoteknik_custom/models/approval_payment_term.py |  3 ++-
 indoteknik_custom/models/res_partner.py           | 15 ++++++++----
 indoteknik_custom/models/sale_order.py            |  9 ++++++++
 indoteknik_custom/views/res_partner.xml           |  1 +
 indoteknik_custom/views/sale_order.xml            |  9 ++++++++
 6 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index c44cad78..55e640e4 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -105,6 +105,34 @@ class AccountMove(models.Model):
         tracking=True
     )
 
+    def _check_and_lock_cbd(self):
+        cbd_term = self.env['account.payment.term'].browse(26)
+        today = date.today()
+
+        # Cari semua invoice overdue
+        overdue_invoices = self.search([
+            ('move_type', '=', 'out_invoice'),
+            ('state', '=', 'posted'),
+            ('payment_state', 'not in', ['paid', 'in_payment', 'reversed']),
+            ('invoice_date_due', '!=', False),
+            ('invoice_date_due', '<=', today - timedelta(days=30)),
+        ], limit=3)
+
+        _logger.info(f"Found {len(overdue_invoices)} overdue invoices for CBD lock check.")
+        _logger.info(f"Overdue Invoices: {overdue_invoices.mapped('name')}")
+
+        # Ambil partner unik dari invoice
+        partners_to_lock = overdue_invoices.mapped('partner_id').filtered(lambda p: not p.is_cbd_locked)
+        _logger.info(f"Partners to lock: {partners_to_lock.mapped('name')}")
+
+        # Lock hanya partner yang belum locked
+        if partners_to_lock:
+            partners_to_lock.write({
+                'is_cbd_locked': True,
+                'property_payment_term_id': cbd_term.id,
+            })
+
+
     def compute_partial_payment(self):
         for move in self:
             if move.amount_total_signed > 0 and move.amount_residual_signed > 0 and move.payment_state == 'partial':
diff --git a/indoteknik_custom/models/approval_payment_term.py b/indoteknik_custom/models/approval_payment_term.py
index 8618856a..08d91738 100644
--- a/indoteknik_custom/models/approval_payment_term.py
+++ b/indoteknik_custom/models/approval_payment_term.py
@@ -171,7 +171,8 @@ class ApprovalPaymentTerm(models.Model):
                 'blocking_stage': self.blocking_stage,
                 'warning_stage': self.warning_stage,
                 'active_limit': self.active_limit,
-                'property_payment_term_id': self.property_payment_term_id.id
+                'property_payment_term_id': self.property_payment_term_id.id,
+                'is_locked_cbd': False,
             })
             self.approve_date = datetime.utcnow()
             self.state = 'approved'
diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index 148a3fd0..017be730 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -1,6 +1,6 @@
 from odoo import models, fields, api
 from odoo.exceptions import UserError, ValidationError
-from datetime import datetime
+from datetime import datetime, timedelta
 from odoo.http import request
 import re
 import requests
@@ -181,10 +181,15 @@ class ResPartner(models.Model):
     payment_difficulty = fields.Selection([('bermasalah', 'Bermasalah'),('sulit', 'Sulit'),('agak_sulit', 'Agak Sulit'),('normal', 'Normal')], string='Payment Difficulty', tracking=3)
     payment_history_url = fields.Text(string='Payment History URL')
 
-    # no compute
-    # payment_diff = fields.Selection([('bermasalah', 'Bermasalah'),('sulit', 'Sulit'),('agak_sulit', 'Agak Sulit'),('normal', 'Normal')], string='Payment Difficulty', tracking=3)
-    
-    # tidak terpakai
+    is_cbd_locked = fields.Boolean("Locked to CBD?", default=False, tracking=True, help="Jika dicentang, maka partner ini terkunci pada payment term CBD karena memiliki invoice yang sudah jatuh tempo lebih dari 30 hari.")
+
+    # centang manual is_cbd_locked jika payment term diubah ke CBD
+    @api.onchange('is_cbd_locked')
+    def _onchange_is_cbd_locked(self):
+        if self.is_cbd_locked:
+            cbd_term = self.env['account.payment.term'].browse(26)
+            if cbd_term:
+                self.property_payment_term_id = cbd_term.id
 
     @api.model
     def _default_payment_term(self):
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index ffb53dce..992c1a5d 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -394,6 +394,15 @@ class SaleOrder(models.Model):
         ('paid', 'Full Paid'),
         ('no_invoice', 'No Invoice'),
     ], string="Payment Status Invoice", compute="_compute_payment_state_custom", store=False)
+    partner_is_cbd_locked = fields.Boolean(
+        string="Partner Locked CBD",
+        compute="_compute_partner_is_cbd_locked"
+    )
+
+    @api.depends('partner_id.is_cbd_locked')
+    def _compute_partner_is_cbd_locked(self):
+        for order in self:
+            order.partner_is_cbd_locked = order.partner_id.is_cbd_locked
 
     @api.depends('invoice_ids.payment_state', 'invoice_ids.amount_total', 'invoice_ids.amount_residual')
     def _compute_payment_state_custom(self):
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index ca1a36de..7541df35 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -21,6 +21,7 @@
                     <field name="reference_number"/>
                 </field>
                 <field name="property_payment_term_id" position="after">
+                    <field name="is_cbd_locked" readonly="1"/>
                     <field name="user_payment_terms_sales" readonly="1"/>
                     <field name="date_payment_terms_sales" readonly="1"/>
                 </field>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index a1a5e0cd..29d1a980 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -42,6 +42,15 @@
                         class="btn-primary"
                         attrs="{'invisible': ['|', ('state', 'not in', ['sale', 'done']), ('has_refund', '=', True)]}" />
                 </xpath> -->
+                <xpath expr="//sheet" position="before">
+                    <field name="partner_is_cbd_locked" invisible="1"/>
+                    <div class="alert alert-danger"
+                        role="alert"
+                        style="height: 40px; margin-bottom:0px;"
+                        attrs="{'invisible':[('partner_is_cbd_locked','=',False)]}">
+                        <strong>Warning!</strong> Payment Terms Customer terkunci menjadi Cash Before Delivery (C.B.D.) karena ada invoice telah jatuh tempo 30 hari. Silakan ajukan Approval Payment Term untuk membuka kunci.
+                    </div>
+                </xpath>
                 <div class="oe_button_box" name="button_box">
                     <field name="advance_payment_move_ids" invisible="1"/>
                     <button name="action_open_advance_payment_moves"
-- 
cgit v1.2.3


From ed459eb048e8e14075134ead0cb80d5da864af53 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 2 Sep 2025 11:39:22 +0700
Subject: (andri) comment method

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

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index 55e640e4..7884b1d5 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -105,32 +105,32 @@ class AccountMove(models.Model):
         tracking=True
     )
 
-    def _check_and_lock_cbd(self):
-        cbd_term = self.env['account.payment.term'].browse(26)
-        today = date.today()
-
-        # Cari semua invoice overdue
-        overdue_invoices = self.search([
-            ('move_type', '=', 'out_invoice'),
-            ('state', '=', 'posted'),
-            ('payment_state', 'not in', ['paid', 'in_payment', 'reversed']),
-            ('invoice_date_due', '!=', False),
-            ('invoice_date_due', '<=', today - timedelta(days=30)),
-        ], limit=3)
-
-        _logger.info(f"Found {len(overdue_invoices)} overdue invoices for CBD lock check.")
-        _logger.info(f"Overdue Invoices: {overdue_invoices.mapped('name')}")
-
-        # Ambil partner unik dari invoice
-        partners_to_lock = overdue_invoices.mapped('partner_id').filtered(lambda p: not p.is_cbd_locked)
-        _logger.info(f"Partners to lock: {partners_to_lock.mapped('name')}")
-
-        # Lock hanya partner yang belum locked
-        if partners_to_lock:
-            partners_to_lock.write({
-                'is_cbd_locked': True,
-                'property_payment_term_id': cbd_term.id,
-            })
+    # def _check_and_lock_cbd(self):
+    #     cbd_term = self.env['account.payment.term'].browse(26)
+    #     today = date.today()
+
+    #     # Cari semua invoice overdue
+    #     overdue_invoices = self.search([
+    #         ('move_type', '=', 'out_invoice'),
+    #         ('state', '=', 'posted'),
+    #         ('payment_state', 'not in', ['paid', 'in_payment', 'reversed']),
+    #         ('invoice_date_due', '!=', False),
+    #         ('invoice_date_due', '<=', today - timedelta(days=30)),
+    #     ], limit=3)
+
+    #     _logger.info(f"Found {len(overdue_invoices)} overdue invoices for CBD lock check.")
+    #     _logger.info(f"Overdue Invoices: {overdue_invoices.mapped('name')}")
+
+    #     # Ambil partner unik dari invoice
+    #     partners_to_lock = overdue_invoices.mapped('partner_id').filtered(lambda p: not p.is_cbd_locked)
+    #     _logger.info(f"Partners to lock: {partners_to_lock.mapped('name')}")
+
+    #     # Lock hanya partner yang belum locked
+    #     if partners_to_lock:
+    #         partners_to_lock.write({
+    #             'is_cbd_locked': True,
+    #             'property_payment_term_id': cbd_term.id,
+    #         })
 
 
     def compute_partial_payment(self):
-- 
cgit v1.2.3


From 70dfadc9aa8274e8f9aafa4ec594af0b5a37343b Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 2 Sep 2025 12:00:26 +0700
Subject: (andri) add tracking payment terms dan fix notif ketika membuat SO

---
 indoteknik_custom/models/res_partner.py | 14 +++++++-------
 indoteknik_custom/views/sale_order.xml  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index 017be730..80fe643b 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -184,12 +184,12 @@ class ResPartner(models.Model):
     is_cbd_locked = fields.Boolean("Locked to CBD?", default=False, tracking=True, help="Jika dicentang, maka partner ini terkunci pada payment term CBD karena memiliki invoice yang sudah jatuh tempo lebih dari 30 hari.")
 
     # centang manual is_cbd_locked jika payment term diubah ke CBD
-    @api.onchange('is_cbd_locked')
-    def _onchange_is_cbd_locked(self):
-        if self.is_cbd_locked:
-            cbd_term = self.env['account.payment.term'].browse(26)
-            if cbd_term:
-                self.property_payment_term_id = cbd_term.id
+    # @api.onchange('is_cbd_locked')
+    # def _onchange_is_cbd_locked(self):
+    #     if self.is_cbd_locked:
+    #         cbd_term = self.env['account.payment.term'].browse(26)
+    #         if cbd_term:
+    #             self.property_payment_term_id = cbd_term.id
 
     @api.model
     def _default_payment_term(self):
@@ -198,7 +198,7 @@ class ResPartner(models.Model):
     property_payment_term_id = fields.Many2one(
         'account.payment.term',
         string='Payment Terms',
-        default=_default_payment_term
+        default=_default_payment_term, tracking=3
     )
 
     @api.depends("street", "street2", "city", "state_id", "country_id", "blok", "nomor", "rt", "rw", "kelurahan_id",
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 29d1a980..236a8b14 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -48,7 +48,7 @@
                         role="alert"
                         style="height: 40px; margin-bottom:0px;"
                         attrs="{'invisible':[('partner_is_cbd_locked','=',False)]}">
-                        <strong>Warning!</strong> Payment Terms Customer terkunci menjadi Cash Before Delivery (C.B.D.) karena ada invoice telah jatuh tempo 30 hari. Silakan ajukan Approval Payment Term untuk membuka kunci.
+                        <strong>Warning!</strong> Payment Terms Customer terkunci menjadi <b>Cash Before Delivery (C.B.D.)</b> karena ada invoice telah jatuh tempo <b>30 hari</b>. Silakan ajukan <b>Approval Payment Term</b> untuk membuka kunci.
                     </div>
                 </xpath>
                 <div class="oe_button_box" name="button_box">
-- 
cgit v1.2.3


From 4cdb3a7b89d5e93449fadafec015e80dad1cf47f Mon Sep 17 00:00:00 2001
From: AndriFP <andrifebriyadiputra@gmail.com>
Date: Sat, 6 Sep 2025 14:04:27 +0700
Subject: (andri) add validasi di SO dan respartner

---
 indoteknik_custom/models/res_partner.py | 16 +++++++++-------
 indoteknik_custom/models/sale_order.py  | 17 +++++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index 80fe643b..b5ce9266 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -183,13 +183,6 @@ class ResPartner(models.Model):
 
     is_cbd_locked = fields.Boolean("Locked to CBD?", default=False, tracking=True, help="Jika dicentang, maka partner ini terkunci pada payment term CBD karena memiliki invoice yang sudah jatuh tempo lebih dari 30 hari.")
 
-    # centang manual is_cbd_locked jika payment term diubah ke CBD
-    # @api.onchange('is_cbd_locked')
-    # def _onchange_is_cbd_locked(self):
-    #     if self.is_cbd_locked:
-    #         cbd_term = self.env['account.payment.term'].browse(26)
-    #         if cbd_term:
-    #             self.property_payment_term_id = cbd_term.id
 
     @api.model
     def _default_payment_term(self):
@@ -201,6 +194,15 @@ class ResPartner(models.Model):
         default=_default_payment_term, tracking=3
     )
 
+    @api.constrains('property_payment_term_id', 'is_cbd_locked')
+    def _check_cbd_lock_partner(self):
+        cbd_term = self.env['account.payment.term'].browse(26)
+        for rec in self:
+            if rec.is_cbd_locked and rec.property_payment_term_id and rec.property_payment_term_id != cbd_term:
+                raise ValidationError(
+                    "Partner ini terkunci ke CBD, hanya boleh pakai Payment Term CBD."
+                )
+
     @api.depends("street", "street2", "city", "state_id", "country_id", "blok", "nomor", "rt", "rw", "kelurahan_id",
                  "kecamatan_id")
     def _alamat_lengkap_text(self):
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 992c1a5d..8a595d8e 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -404,6 +404,23 @@ class SaleOrder(models.Model):
         for order in self:
             order.partner_is_cbd_locked = order.partner_id.is_cbd_locked
 
+    @api.onchange('payment_term_id')
+    def _onchange_partner_payment_term(self):
+        cbd_term = self.env['account.payment.term'].browse(26)
+        for rec in self:
+            if rec.partner_id and rec.partner_id.is_cbd_locked and cbd_term:
+                rec.payment_term_id = cbd_term
+
+    @api.constrains('payment_term_id', 'partner_id', 'state')
+    def _check_cbd_lock_sale_order(self):
+        cbd_term = self.env['account.payment.term'].browse(26)
+        for rec in self:
+            if rec.state == 'draft' and rec.partner_id.is_cbd_locked:
+                if rec.payment_term_id and rec.payment_term_id != cbd_term:
+                    raise ValidationError(
+                        "Customer ini terkunci ke CBD, hanya boleh pakai Payment Term CBD."
+                    )
+
     @api.depends('invoice_ids.payment_state', 'invoice_ids.amount_total', 'invoice_ids.amount_residual')
     def _compute_payment_state_custom(self):
         for order in self:
-- 
cgit v1.2.3


From 1767a569e88e8254fdbefdfaf6be6045f1f5235f Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 10 Sep 2025 11:45:39 +0700
Subject: <miqdad> apt request done

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

diff --git a/indoteknik_custom/models/approval_payment_term.py b/indoteknik_custom/models/approval_payment_term.py
index 8618856a..85fd1613 100644
--- a/indoteknik_custom/models/approval_payment_term.py
+++ b/indoteknik_custom/models/approval_payment_term.py
@@ -69,8 +69,8 @@ class ApprovalPaymentTerm(models.Model):
         return res
 
     def _track_changes_for_user_688(self, vals, old_values_dict):
-        if self.env.user.id != 688:
-            return
+        # if self.env.user.id != 688:
+        #     return
 
         tracked_fields = {"blocking_stage", "warning_stage", "property_payment_term_id"}
 
diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index 5c130f3f..b0b99689 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -7,7 +7,7 @@
             <tree default_order="create_date desc">
                 <field name="number"/>
                 <field name="partner_id"/>
-                <field name="parent_id"/>
+                <field name="parent_id" optional="hide"/>
                 <field name="property_payment_term_id"/>
                 <field name="create_date" optional="hide"/>
                 <field name="approve_date" optional="hide"/>
-- 
cgit v1.2.3


From e3c9d12ca2356493bb75c7362d0da54280889828 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 10 Sep 2025 12:22:07 +0700
Subject: <miqdad> dunning done

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

diff --git a/indoteknik_custom/models/dunning_run.py b/indoteknik_custom/models/dunning_run.py
index 5a6aebac..eb6f06dc 100644
--- a/indoteknik_custom/models/dunning_run.py
+++ b/indoteknik_custom/models/dunning_run.py
@@ -31,6 +31,7 @@ class DunningRun(models.Model):
     description = fields.Char(string='Description')
     comment = fields.Char(string='Comment')
     grand_total = fields.Float(string='Grand Total', compute="_compute_grand_total")
+    is_paid = fields.Boolean(string='Sudah Bayar?')
 
     def _compute_grand_total(self):
         for record in self:
@@ -149,4 +150,5 @@ class DunningRunLine(models.Model):
     total_amt = fields.Float(string='Total Amount')
     open_amt = fields.Float(string='Open Amount')
     due_date = fields.Date(string='Due Date')
+    payment_term = fields.Many2one('account.payment.term', related='invoice_id.invoice_payment_term_id', string='Payment Term')
 
diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index f624c42e..7623666b 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -25,6 +25,7 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="partner_id"/>
+                <field name="payment_term"/>
                 <field name="invoice_id"/>
                 <field name="date_invoice"/>
                 <field name="efaktur_id"/>
@@ -74,6 +75,7 @@
                                 <field name="date_terima_tukar_faktur"/>
                                 <field name="shipper_faktur_id"/>
                                 <field name="grand_total"/>
+                                <field name="is_paid"/>
                             </group>
                         </group>
                         <notebook>
-- 
cgit v1.2.3


From 32d0ca72aa38701747794dab06e7fb98b6f31489 Mon Sep 17 00:00:00 2001
From: AndriFP <113114423+andrifp@users.noreply.github.com>
Date: Wed, 10 Sep 2025 13:42:34 +0700
Subject: (andri) rev validasi

---
 indoteknik_custom/models/res_partner.py |  4 ++--
 indoteknik_custom/models/sale_order.py  | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index b5ce9266..0c932dbe 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -196,9 +196,9 @@ class ResPartner(models.Model):
 
     @api.constrains('property_payment_term_id', 'is_cbd_locked')
     def _check_cbd_lock_partner(self):
-        cbd_term = self.env['account.payment.term'].browse(26)
+        # cbd_term = self.env['account.payment.term'].browse(26)
         for rec in self:
-            if rec.is_cbd_locked and rec.property_payment_term_id and rec.property_payment_term_id != cbd_term:
+            if rec.is_cbd_locked:
                 raise ValidationError(
                     "Partner ini terkunci ke CBD, hanya boleh pakai Payment Term CBD."
                 )
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 8a595d8e..89bf0d25 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -404,22 +404,22 @@ class SaleOrder(models.Model):
         for order in self:
             order.partner_is_cbd_locked = order.partner_id.is_cbd_locked
 
-    @api.onchange('payment_term_id')
-    def _onchange_partner_payment_term(self):
-        cbd_term = self.env['account.payment.term'].browse(26)
-        for rec in self:
-            if rec.partner_id and rec.partner_id.is_cbd_locked and cbd_term:
-                rec.payment_term_id = cbd_term
+    # @api.onchange('payment_term_id')
+    # def _onchange_partner_payment_term(self):
+    #     cbd_term = self.env['account.payment.term'].browse(26)
+    #     for rec in self:
+    #         if rec.partner_id and rec.partner_id.is_cbd_locked and cbd_term:
+    #             rec.payment_term_id = cbd_term
 
     @api.constrains('payment_term_id', 'partner_id', 'state')
     def _check_cbd_lock_sale_order(self):
-        cbd_term = self.env['account.payment.term'].browse(26)
+        # cbd_term = self.env['account.payment.term'].browse(26)
         for rec in self:
             if rec.state == 'draft' and rec.partner_id.is_cbd_locked:
-                if rec.payment_term_id and rec.payment_term_id != cbd_term:
-                    raise ValidationError(
-                        "Customer ini terkunci ke CBD, hanya boleh pakai Payment Term CBD."
-                    )
+                # if rec.payment_term_id and rec.payment_term_id != cbd_term:
+                raise ValidationError(
+                    "Customer ini terkunci ke CBD, hanya boleh pakai Payment Term CBD."
+                )
 
     @api.depends('invoice_ids.payment_state', 'invoice_ids.amount_total', 'invoice_ids.amount_residual')
     def _compute_payment_state_custom(self):
-- 
cgit v1.2.3


From 4ce4b37fa551e1059cdb5f64f98c53d4289d3268 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 10 Sep 2025 16:04:39 +0700
Subject: <miqdad> dunning done

---
 indoteknik_custom/models/approval_payment_term.py |  3 ++-
 indoteknik_custom/models/dunning_run.py           | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/models/approval_payment_term.py b/indoteknik_custom/models/approval_payment_term.py
index 85fd1613..61339b99 100644
--- a/indoteknik_custom/models/approval_payment_term.py
+++ b/indoteknik_custom/models/approval_payment_term.py
@@ -106,7 +106,8 @@ class ApprovalPaymentTerm(models.Model):
 
             if changes:
                 timestamp = fields.Datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-                rec.change_log_688 = f"{timestamp} - Perubahan oleh Widya:\n" + "\n".join(changes)
+                user = self.env.user
+                rec.change_log_688 = f"{timestamp} - Perubahan oleh {user.name}:\n" + "\n".join(changes)
 
 
     @staticmethod
diff --git a/indoteknik_custom/models/dunning_run.py b/indoteknik_custom/models/dunning_run.py
index eb6f06dc..40e5f71e 100644
--- a/indoteknik_custom/models/dunning_run.py
+++ b/indoteknik_custom/models/dunning_run.py
@@ -1,6 +1,6 @@
 from odoo import models, api, fields
 from odoo.exceptions import AccessError, UserError, ValidationError
-from datetime import timedelta
+from datetime import timedelta, date
 import logging
 
 
@@ -32,7 +32,17 @@ class DunningRun(models.Model):
     comment = fields.Char(string='Comment')
     grand_total = fields.Float(string='Grand Total', compute="_compute_grand_total")
     is_paid = fields.Boolean(string='Sudah Bayar?')
-
+    tanggal_pembayaran = fields.Date(
+        string='Tanggal Pembayaran',
+        compute="_compute_tanggal_pembayaran",
+        readonly=True,
+    )
+
+    @api.depends('is_paid')
+    def _compute_tanggal_pembayaran(self):
+        today = fields.Date.context_today(self)
+        for rec in self:
+            rec.tanggal_pembayaran = today if rec.is_paid else False
     def _compute_grand_total(self):
         for record in self:
             grand_total = 0
-- 
cgit v1.2.3


From 7887ebd226edebbb3261c802c38f0d0925a17f91 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 10 Sep 2025 16:04:47 +0700
Subject: <miqdad> dunning done

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

diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index 7623666b..7c5f4af6 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -76,6 +76,7 @@
                                 <field name="shipper_faktur_id"/>
                                 <field name="grand_total"/>
                                 <field name="is_paid"/>
+                                <field name="tanggal_pembayaran"/>
                             </group>
                         </group>
                         <notebook>
-- 
cgit v1.2.3


From 8aceb84b2cf029308903b39bfe139a05ea8f73f6 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 10 Sep 2025 16:08:34 +0700
Subject: <miqdad> dunning done

---
 indoteknik_custom/models/dunning_run.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indoteknik_custom/models/dunning_run.py b/indoteknik_custom/models/dunning_run.py
index 40e5f71e..557eacef 100644
--- a/indoteknik_custom/models/dunning_run.py
+++ b/indoteknik_custom/models/dunning_run.py
@@ -43,6 +43,7 @@ class DunningRun(models.Model):
         today = fields.Date.context_today(self)
         for rec in self:
             rec.tanggal_pembayaran = today if rec.is_paid else False
+
     def _compute_grand_total(self):
         for record in self:
             grand_total = 0
-- 
cgit v1.2.3


From e276a3bbf0a2726cbfa6bb5606d2dfbfe1e03143 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 10 Sep 2025 18:34:49 +0700
Subject: <Miqdad> Remove tanggal bayar and is paid

---
 indoteknik_custom/models/dunning_run.py | 12 ------------
 indoteknik_custom/views/dunning_run.xml |  3 +--
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/indoteknik_custom/models/dunning_run.py b/indoteknik_custom/models/dunning_run.py
index 557eacef..9feea1d1 100644
--- a/indoteknik_custom/models/dunning_run.py
+++ b/indoteknik_custom/models/dunning_run.py
@@ -31,18 +31,6 @@ class DunningRun(models.Model):
     description = fields.Char(string='Description')
     comment = fields.Char(string='Comment')
     grand_total = fields.Float(string='Grand Total', compute="_compute_grand_total")
-    is_paid = fields.Boolean(string='Sudah Bayar?')
-    tanggal_pembayaran = fields.Date(
-        string='Tanggal Pembayaran',
-        compute="_compute_tanggal_pembayaran",
-        readonly=True,
-    )
-
-    @api.depends('is_paid')
-    def _compute_tanggal_pembayaran(self):
-        today = fields.Date.context_today(self)
-        for rec in self:
-            rec.tanggal_pembayaran = today if rec.is_paid else False
 
     def _compute_grand_total(self):
         for record in self:
diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index 7c5f4af6..fbd9dc72 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -75,8 +75,7 @@
                                 <field name="date_terima_tukar_faktur"/>
                                 <field name="shipper_faktur_id"/>
                                 <field name="grand_total"/>
-                                <field name="is_paid"/>
-                                <field name="tanggal_pembayaran"/>
+<!--                                <field name="tanggal_pembayaran"/>-->
                             </group>
                         </group>
                         <notebook>
-- 
cgit v1.2.3


From 6a56c1d6bfa09bf5f4d190e3f8fee5265aa01c3f Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 11 Sep 2025 08:12:13 +0700
Subject: <miqdad> remove is paid and tanggal bayar

---
 indoteknik_custom/models/dunning_run.py | 6 ------
 indoteknik_custom/views/dunning_run.xml | 2 --
 2 files changed, 8 deletions(-)

diff --git a/indoteknik_custom/models/dunning_run.py b/indoteknik_custom/models/dunning_run.py
index 557eacef..5dba3f7d 100644
--- a/indoteknik_custom/models/dunning_run.py
+++ b/indoteknik_custom/models/dunning_run.py
@@ -31,12 +31,6 @@ class DunningRun(models.Model):
     description = fields.Char(string='Description')
     comment = fields.Char(string='Comment')
     grand_total = fields.Float(string='Grand Total', compute="_compute_grand_total")
-    is_paid = fields.Boolean(string='Sudah Bayar?')
-    tanggal_pembayaran = fields.Date(
-        string='Tanggal Pembayaran',
-        compute="_compute_tanggal_pembayaran",
-        readonly=True,
-    )
 
     @api.depends('is_paid')
     def _compute_tanggal_pembayaran(self):
diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index 7c5f4af6..1cac744a 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -75,8 +75,6 @@
                                 <field name="date_terima_tukar_faktur"/>
                                 <field name="shipper_faktur_id"/>
                                 <field name="grand_total"/>
-                                <field name="is_paid"/>
-                                <field name="tanggal_pembayaran"/>
                             </group>
                         </group>
                         <notebook>
-- 
cgit v1.2.3


From 6c9c60324674ce1a0b46a863a6ae0ca0e8042d2f Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 11 Sep 2025 09:17:17 +0700
Subject: <miqdad> remove tanggal bayar

---
 indoteknik_custom/models/dunning_run.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/indoteknik_custom/models/dunning_run.py b/indoteknik_custom/models/dunning_run.py
index 5dba3f7d..9feea1d1 100644
--- a/indoteknik_custom/models/dunning_run.py
+++ b/indoteknik_custom/models/dunning_run.py
@@ -32,12 +32,6 @@ class DunningRun(models.Model):
     comment = fields.Char(string='Comment')
     grand_total = fields.Float(string='Grand Total', compute="_compute_grand_total")
 
-    @api.depends('is_paid')
-    def _compute_tanggal_pembayaran(self):
-        today = fields.Date.context_today(self)
-        for rec in self:
-            rec.tanggal_pembayaran = today if rec.is_paid else False
-
     def _compute_grand_total(self):
         for record in self:
             grand_total = 0
-- 
cgit v1.2.3


From 777f284f1811a3127d98cf5bb49934dc04e75002 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 11 Sep 2025 10:32:54 +0700
Subject: <Miqdad> hide efaktur

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

diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index 1cac744a..9c28591c 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -28,7 +28,7 @@
                 <field name="payment_term"/>
                 <field name="invoice_id"/>
                 <field name="date_invoice"/>
-                <field name="efaktur_id"/>
+                <field name="efaktur_id" optional="hide"/>
                 <field name="reference"/>
                 <field name="total_amt" sum="Grand Total Amount"/>
                 <field name="open_amt"/>
-- 
cgit v1.2.3


From d27561901fa2f0ab7534f255351e82459c6a531e Mon Sep 17 00:00:00 2001
From: AndriFP <113114423+andrifp@users.noreply.github.com>
Date: Thu, 11 Sep 2025 10:45:58 +0700
Subject: (andri) fix

---
 indoteknik_custom/models/res_partner.py | 8 --------
 indoteknik_custom/views/res_partner.xml | 2 +-
 indoteknik_custom/views/sale_order.xml  | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index 0c932dbe..36570e8f 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -194,14 +194,6 @@ class ResPartner(models.Model):
         default=_default_payment_term, tracking=3
     )
 
-    @api.constrains('property_payment_term_id', 'is_cbd_locked')
-    def _check_cbd_lock_partner(self):
-        # cbd_term = self.env['account.payment.term'].browse(26)
-        for rec in self:
-            if rec.is_cbd_locked:
-                raise ValidationError(
-                    "Partner ini terkunci ke CBD, hanya boleh pakai Payment Term CBD."
-                )
 
     @api.depends("street", "street2", "city", "state_id", "country_id", "blok", "nomor", "rt", "rw", "kelurahan_id",
                  "kecamatan_id")
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 7541df35..7d5be3b7 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -108,7 +108,7 @@
                     <field name="reminder_invoices"/>
                 </xpath>
                 <xpath expr="//field[@name='property_payment_term_id']" position="attributes">
-                    <attribute name="readonly">0</attribute>
+                    <attribute name="readonly">1</attribute>
                 </xpath>
                 <xpath expr="//field[@name='property_supplier_payment_term_id']" position="attributes">
                     <attribute name="readonly">1</attribute>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 236a8b14..5f1a6117 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -47,7 +47,7 @@
                     <div class="alert alert-danger"
                         role="alert"
                         style="height: 40px; margin-bottom:0px;"
-                        attrs="{'invisible':[('partner_is_cbd_locked','=',False)]}">
+                        attrs="{'invisible':['|', ('partner_is_cbd_locked','=',False), ('state', 'not in', ['draft', 'cancel'])]}">
                         <strong>Warning!</strong> Payment Terms Customer terkunci menjadi <b>Cash Before Delivery (C.B.D.)</b> karena ada invoice telah jatuh tempo <b>30 hari</b>. Silakan ajukan <b>Approval Payment Term</b> untuk membuka kunci.
                     </div>
                 </xpath>
-- 
cgit v1.2.3


From c5e14063c50ae06b829eca0415b9b14b03ccb0b6 Mon Sep 17 00:00:00 2001
From: AndriFP <113114423+andrifp@users.noreply.github.com>
Date: Thu, 11 Sep 2025 11:07:29 +0700
Subject: (andri) fix

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

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index d0fd7f48..dbe6d789 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -403,12 +403,6 @@ class SaleOrder(models.Model):
         for order in self:
             order.partner_is_cbd_locked = order.partner_id.is_cbd_locked
 
-    # @api.onchange('payment_term_id')
-    # def _onchange_partner_payment_term(self):
-    #     cbd_term = self.env['account.payment.term'].browse(26)
-    #     for rec in self:
-    #         if rec.partner_id and rec.partner_id.is_cbd_locked and cbd_term:
-    #             rec.payment_term_id = cbd_term
 
     @api.constrains('payment_term_id', 'partner_id', 'state')
     def _check_cbd_lock_sale_order(self):
-- 
cgit v1.2.3


From ee6c5f572f06e5fde497fc3aed5d78c3f0d7d389 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 11 Sep 2025 17:13:59 +0700
Subject: <miqdad> Gudang pameran

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

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 9952af9a..67e712d1 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2115,8 +2115,8 @@ class SaleOrder(models.Model):
         if self.payment_term_id.id == 31 and self.total_percent_margin < 25:
             raise UserError("Jika ingin menggunakan Tempo 90 Hari maka margin harus di atas 25%")
 
-        if self.warehouse_id.id != 8 and self.warehouse_id.id != 10:  # GD Bandengan
-            raise UserError('Gudang harus Bandengan')
+        if self.warehouse_id.id != 8 and self.warehouse_id.id != 10 and self.warehouse_id.id != 12:  # GD Bandengan / Pameran
+            raise UserError('Gudang harus Bandengan atau Pameran')
 
         if self.state not in ['draft', 'sent']:
             raise UserError("Status harus draft atau sent")
-- 
cgit v1.2.3


From 51e77c4968cbc0e577e161a38407bb9f291a6f62 Mon Sep 17 00:00:00 2001
From: AndriFP <113114423+andrifp@users.noreply.github.com>
Date: Thu, 11 Sep 2025 18:43:25 +0700
Subject: (andri) fix

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

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 76d4d7e7..42f58d2b 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -393,15 +393,15 @@ class SaleOrder(models.Model):
         ('paid', 'Full Paid'),
         ('no_invoice', 'No Invoice'),
     ], string="Payment Status Invoice", compute="_compute_payment_state_custom", store=False)
-    partner_is_cbd_locked = fields.Boolean(
-        string="Partner Locked CBD",
-        compute="_compute_partner_is_cbd_locked"
-    )
+    # partner_is_cbd_locked = fields.Boolean(
+    #     string="Partner Locked CBD",
+    #     compute="_compute_partner_is_cbd_locked"
+    # )
 
-    @api.depends('partner_id.is_cbd_locked')
-    def _compute_partner_is_cbd_locked(self):
-        for order in self:
-            order.partner_is_cbd_locked = order.partner_id.is_cbd_locked
+    # @api.depends('partner_id.is_cbd_locked')
+    # def _compute_partner_is_cbd_locked(self):
+    #     for order in self:
+    #         order.partner_is_cbd_locked = order.partner_id.is_cbd_locked
 
 
     @api.constrains('payment_term_id', 'partner_id', 'state')
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 326fd560..542ffa0c 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -41,7 +41,7 @@
                         string="Refund"
                         class="btn-primary" />
                 </xpath>
-                <xpath expr="//sheet" position="before">
+                <!-- <xpath expr="//sheet" position="before">
                     <field name="partner_is_cbd_locked" invisible="1"/>
                     <div class="alert alert-danger"
                         role="alert"
@@ -49,7 +49,7 @@
                         attrs="{'invisible':['|', ('partner_is_cbd_locked','=',False), ('state', 'not in', ['draft', 'cancel'])]}">
                         <strong>Warning!</strong> Payment Terms Customer terkunci menjadi <b>Cash Before Delivery (C.B.D.)</b> karena ada invoice telah jatuh tempo <b>30 hari</b>. Silakan ajukan <b>Approval Payment Term</b> untuk membuka kunci.
                     </div>
-                </xpath>
+                </xpath> -->
                 <div class="oe_button_box" name="button_box">
                     <field name="advance_payment_move_ids" invisible="1"/>
                     <button name="action_open_advance_payment_moves"
-- 
cgit v1.2.3


From 6c5b5424c88650e39418ffd416a74205a0ae185b Mon Sep 17 00:00:00 2001
From: AndriFP <113114423+andrifp@users.noreply.github.com>
Date: Thu, 11 Sep 2025 18:47:32 +0700
Subject: (andri) fix

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

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 42f58d2b..76d4d7e7 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -393,15 +393,15 @@ class SaleOrder(models.Model):
         ('paid', 'Full Paid'),
         ('no_invoice', 'No Invoice'),
     ], string="Payment Status Invoice", compute="_compute_payment_state_custom", store=False)
-    # partner_is_cbd_locked = fields.Boolean(
-    #     string="Partner Locked CBD",
-    #     compute="_compute_partner_is_cbd_locked"
-    # )
+    partner_is_cbd_locked = fields.Boolean(
+        string="Partner Locked CBD",
+        compute="_compute_partner_is_cbd_locked"
+    )
 
-    # @api.depends('partner_id.is_cbd_locked')
-    # def _compute_partner_is_cbd_locked(self):
-    #     for order in self:
-    #         order.partner_is_cbd_locked = order.partner_id.is_cbd_locked
+    @api.depends('partner_id.is_cbd_locked')
+    def _compute_partner_is_cbd_locked(self):
+        for order in self:
+            order.partner_is_cbd_locked = order.partner_id.is_cbd_locked
 
 
     @api.constrains('payment_term_id', 'partner_id', 'state')
-- 
cgit v1.2.3


From 5fedb89271610d5e504ef40af35bd74cdbf2928f Mon Sep 17 00:00:00 2001
From: AndriFP <113114423+andrifp@users.noreply.github.com>
Date: Thu, 11 Sep 2025 18:48:16 +0700
Subject: fix

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

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 7d5be3b7..931a5937 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -21,7 +21,7 @@
                     <field name="reference_number"/>
                 </field>
                 <field name="property_payment_term_id" position="after">
-                    <field name="is_cbd_locked" readonly="1"/>
+                    <!-- <field name="is_cbd_locked" readonly="1"/> -->
                     <field name="user_payment_terms_sales" readonly="1"/>
                     <field name="date_payment_terms_sales" readonly="1"/>
                 </field>
-- 
cgit v1.2.3


From 73d249fd48d0aeae8ac77946f07668210e12ae7b Mon Sep 17 00:00:00 2001
From: AndriFP <113114423+andrifp@users.noreply.github.com>
Date: Thu, 11 Sep 2025 21:27:09 +0700
Subject: fix

---
 indoteknik_custom/views/res_partner.xml | 2 +-
 indoteknik_custom/views/sale_order.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 931a5937..7d5be3b7 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -21,7 +21,7 @@
                     <field name="reference_number"/>
                 </field>
                 <field name="property_payment_term_id" position="after">
-                    <!-- <field name="is_cbd_locked" readonly="1"/> -->
+                    <field name="is_cbd_locked" readonly="1"/>
                     <field name="user_payment_terms_sales" readonly="1"/>
                     <field name="date_payment_terms_sales" readonly="1"/>
                 </field>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 542ffa0c..326fd560 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -41,7 +41,7 @@
                         string="Refund"
                         class="btn-primary" />
                 </xpath>
-                <!-- <xpath expr="//sheet" position="before">
+                <xpath expr="//sheet" position="before">
                     <field name="partner_is_cbd_locked" invisible="1"/>
                     <div class="alert alert-danger"
                         role="alert"
@@ -49,7 +49,7 @@
                         attrs="{'invisible':['|', ('partner_is_cbd_locked','=',False), ('state', 'not in', ['draft', 'cancel'])]}">
                         <strong>Warning!</strong> Payment Terms Customer terkunci menjadi <b>Cash Before Delivery (C.B.D.)</b> karena ada invoice telah jatuh tempo <b>30 hari</b>. Silakan ajukan <b>Approval Payment Term</b> untuk membuka kunci.
                     </div>
-                </xpath> -->
+                </xpath>
                 <div class="oe_button_box" name="button_box">
                     <field name="advance_payment_move_ids" invisible="1"/>
                     <button name="action_open_advance_payment_moves"
-- 
cgit v1.2.3


From cddba12aaf9c4265770487d407f96f2f3fd910ee Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 12 Sep 2025 09:27:45 +0700
Subject: <Miqdad> pindah posisi reference dan payment term di form view

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

diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index 9c28591c..51377f78 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -25,14 +25,14 @@
         <field name="arch" type="xml">
             <tree>
                 <field name="partner_id"/>
-                <field name="payment_term"/>
+                <field name="reference"/>
                 <field name="invoice_id"/>
                 <field name="date_invoice"/>
                 <field name="efaktur_id" optional="hide"/>
-                <field name="reference"/>
                 <field name="total_amt" sum="Grand Total Amount"/>
                 <field name="open_amt"/>
                 <field name="due_date"/>
+                <field name="payment_term"/>
             </tree>
         </field>
     </record>
-- 
cgit v1.2.3


From c0ea809f621f07727a2e3bf54952818992553ea2 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 12 Sep 2025 10:44:22 +0700
Subject: <miqdad> Fix duplicate ORT

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

diff --git a/indoteknik_custom/models/tukar_guling.py b/indoteknik_custom/models/tukar_guling.py
index 6e839bf0..d718ba0f 100644
--- a/indoteknik_custom/models/tukar_guling.py
+++ b/indoteknik_custom/models/tukar_guling.py
@@ -710,7 +710,7 @@ class TukarGuling(models.Model):
 
             ### ======== SRT dari BU/OUT =========
             srt_return_lines = []
-            if mapping_koli:
+            if mapping_koli and record.operations.picking_type_id.id == 29:
                 for prod in mapping_koli.mapped('product_id'):
                     qty_total = sum(mk.qty_return for mk in mapping_koli.filtered(lambda m: m.product_id == prod))
                     move = bu_out.move_lines.filtered(lambda m: m.product_id == prod)
@@ -723,7 +723,7 @@ class TukarGuling(models.Model):
                     }))
                     _logger.info(f"📟 SRT line: {prod.display_name} | qty={qty_total}")
 
-            elif not mapping_koli:
+            elif not mapping_koli and record.operations.picking_type_id.id == 29:
                 for line in record.line_ids:
                     move = bu_out.move_lines.filtered(lambda m: m.product_id == line.product_id)
                     if not move:
-- 
cgit v1.2.3


From 7d07a282c134cb5e2a784b73cc477e3f398df57c Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 12 Sep 2025 10:48:13 +0700
Subject: <hafid> add rc in journal

---
 indoteknik_api/controllers/api_v1/user.py     | 4 +++-
 indoteknik_custom/models/refund_sale_order.py | 8 ++++++--
 indoteknik_custom/models/stock_move.py        | 1 +
 indoteknik_custom/views/account_move.xml      | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index dde30fec..3511bc52 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -89,7 +89,9 @@ class User(controller.Controller):
                 'name': name,
                 'login': email,
                 'oauth_provider_id': request.env.ref('auth_oauth.provider_google').id,
-                'sel_groups_1_9_10': 9
+                'sel_groups_1_9_10': 9,
+                'active': True,
+                
             }
 
             user = request.env['res.users'].create(user_data)
diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index 731d8e41..e981abb5 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -462,7 +462,7 @@ class RefundSaleOrder(models.Model):
         total_invoice = 0.0
 
         so_ids = self.sale_order_ids.ids
-
+        amount_refund_before = 0.0
         for so in self.sale_order_ids:
             self.ongkir += so.delivery_amt or 0.0
             valid_invoices = so.invoice_ids.filtered(
@@ -470,6 +470,10 @@ class RefundSaleOrder(models.Model):
             )
             all_invoices |= valid_invoices
             total_invoice += sum(valid_invoices.mapped('amount_total_signed'))
+            refunds = self.env['refund.sale.order'].search([
+                ('sale_order_ids', 'in', so_ids)
+            ])
+            amount_refund_before += sum(refunds.mapped('amount_refund')) if refunds else 0.0
 
         moves = self.env['account.move'].search([
             ('sale_id', 'in', so_ids),
@@ -478,7 +482,7 @@ class RefundSaleOrder(models.Model):
         ])
         total_uang_muka = sum(moves.mapped('amount_total_signed')) if moves else 0.0
         total_midtrans = sum(self.env['sale.order'].browse(so_ids).mapped('gross_amount')) if so_ids else 0.0
-        self.uang_masuk = total_uang_muka + total_midtrans
+        self.uang_masuk = (total_uang_muka + total_midtrans) - amount_refund_before
 
             
         self.invoice_ids = all_invoices
diff --git a/indoteknik_custom/models/stock_move.py b/indoteknik_custom/models/stock_move.py
index 90ab30a4..64cb6ba6 100644
--- a/indoteknik_custom/models/stock_move.py
+++ b/indoteknik_custom/models/stock_move.py
@@ -15,6 +15,7 @@ class StockMove(models.Model):
     barcode = fields.Char(string='Barcode', related='product_id.barcode')
     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)
 
     # @api.model_create_multi
     # def create(self, vals_list):
diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 1b477c6d..c88effd5 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -39,6 +39,7 @@
                 </field>
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('has_refund_so', '=', True)]}"/>
+                    <field name="refund_id" readonly="1" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('has_refund_so', '=', False)]}"/>
                     <field name="refund_so_links" readonly="1" widget="html" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('has_refund_so', '=', False)]}"/>
                     <field name="has_refund_so" invisible="1"/>
                 </field>
-- 
cgit v1.2.3


From fb069315f937ea1a8a094d23f22f8314cef412a4 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 12 Sep 2025 14:37:48 +0700
Subject: <hafid> fix label

---
 indoteknik_custom/models/refund_sale_order.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index 9bcdd974..f511ed5d 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -824,15 +824,26 @@ class RefundSaleOrder(models.Model):
             # Ambil label refund type
             refund_type_label = dict(
                 self.fields_get(allfields=['refund_type'])['refund_type']['selection']
-            ).get(refund.refund_type, '').replace("Refund ", "").upper()
-
+            ).get(refund.refund_type, '')
+
+            # Normalisasi
+            refund_type_label = refund_type_label.upper()
+
+            if refund.refund_type in ['barang_kosong', 'barang_kosong_sebagian']:
+                refund_type_label = "REFUND BARANG KOSONG"
+            elif refund.refund_type in ['retur_half', 'retur']:
+                refund_type_label = "REFUND RETUR BARANG"
+            elif refund.refund_type == 'uang':
+                refund_type_label = "REFUND LEBIH BAYAR"
+            elif refund.refund_type == 'salah_transfer':
+                refund_type_label = "REFUND SALAH TRANSFER"
             
 
             if not partner:
                 raise UserError("❌ Partner tidak ditemukan.")
 
             # Ref format
-            ref_text = f"REFUND {refund_type_label} {refund.name or ''} {partner.display_name}".upper()
+            ref_text = f"{refund_type_label} {refund.name or ''} {partner.display_name}".upper()
 
             # Buat Account Move (Journal Entry)
             account_move = self.env['account.move'].create({
@@ -882,7 +893,8 @@ class RefundSaleOrder(models.Model):
     def _compute_journal_refund_move_id(self):
         for rec in self:
             move = self.env['account.move'].search([
-                ('refund_id', '=', rec.id)
+                ('refund_id', '=', rec.id),
+                ('state', '!=', 'cancel')
             ], limit=1)
             rec.journal_refund_move_id = move
 
-- 
cgit v1.2.3


From 71882195d32ac190ea2225ab61fec7a796e30c70 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 12 Sep 2025 15:29:28 +0700
Subject: remove required npwp sppkp nib and fix purchase report

---
 indoteknik_custom/models/sale_order.py       | 105 ++++++++-------------------
 indoteknik_custom/models/sale_order_line.py  |   6 --
 indoteknik_custom/report/purchase_report.xml | 103 +++++++++++---------------
 indoteknik_custom/views/res_partner.xml      |  10 +--
 indoteknik_custom/views/sale_order.xml       |   6 +-
 5 files changed, 81 insertions(+), 149 deletions(-)

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 76d4d7e7..c767dd04 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -234,9 +234,9 @@ class SaleOrder(models.Model):
     customer_type = fields.Selection([
         ('pkp', 'PKP'),
         ('nonpkp', 'Non PKP')
-    ], required=True, compute='_compute_partner_field')
-    sppkp = fields.Char(string="SPPKP", required=True, tracking=True, compute='_compute_partner_field')
-    npwp = fields.Char(string="NPWP", required=True, tracking=True, compute='_compute_partner_field')
+    ], related="partner_id.customer_type", string="Customer Type", readonly=True)
+    sppkp = fields.Char(string="SPPKP", related="partner_id.sppkp")
+    npwp = fields.Char(string="NPWP", related="partner_id.npwp")
     purchase_total = fields.Monetary(string='Purchase Total', compute='_compute_purchase_total')
     voucher_id = fields.Many2one(comodel_name='voucher', string='Voucher', copy=False)
     applied_voucher_id = fields.Many2one(comodel_name='voucher', string='Applied Voucher', copy=False)
@@ -2049,22 +2049,22 @@ class SaleOrder(models.Model):
     #         return [('id', 'not in', order_ids)]
     #     return ['&', ('order_line.invoice_lines.move_id.move_type', 'in', ('out_invoice', 'out_refund')), ('order_line.invoice_lines.move_id', operator, value)]
 
-    @api.depends('partner_id')
-    def _compute_partner_field(self):
-        for order in self:
-            partner = order.partner_id.parent_id or order.partner_id
-            order.npwp = partner.npwp
-            order.sppkp = partner.sppkp
-            order.customer_type = partner.customer_type
+    # @api.depends('partner_id')
+    # def _compute_partner_field(self):
+    #     for order in self:
+    #         partner = order.partner_id.parent_id or order.partner_id
+    #         order.npwp = partner.npwp
+    #         order.sppkp = partner.sppkp
+    #         order.customer_type = partner.customer_type
 
     @api.onchange('partner_id')
     def onchange_partner_contact(self):
         parent_id = self.partner_id.parent_id
         parent_id = parent_id if parent_id else self.partner_id
 
-        self.npwp = parent_id.npwp
-        self.sppkp = parent_id.sppkp
-        self.customer_type = parent_id.customer_type
+        # self.npwp = parent_id.npwp
+        # self.sppkp = parent_id.sppkp
+        # self.customer_type = parent_id.customer_type
         self.email = parent_id.email
         self.pareto_status = parent_id.pareto_status
         self.user_id = parent_id.user_id
@@ -2141,9 +2141,15 @@ class SaleOrder(models.Model):
         if self.state not in ['draft', 'sent']:
             raise UserError("Status harus draft atau sent")
 
-        self._validate_npwp()
-
     def _validate_npwp(self):
+        if not self.npwp:
+            raise UserError("NPWP partner kosong, silahkan isi terlebih dahulu npwp nya di contact partner")
+        
+        if not self.customer_type:
+            raise UserError("Customer Type partner kosong, silahkan isi terlebih dahulu Customer Type nya di contact partner")
+        
+        if not self.sppkp:
+            raise UserError("SPPKP partner kosong, silahkan isi terlebih dahulu SPPKP nya di contact partner")
         num_digits = sum(c.isdigit() for c in self.npwp)
 
         if num_digits < 10:
@@ -2157,6 +2163,7 @@ class SaleOrder(models.Model):
 
         self._validate_order()
         for order in self:
+            order._validate_npwp()
             order._validate_uniform_taxes()
             order.order_line.validate_line()
 
@@ -2211,9 +2218,8 @@ class SaleOrder(models.Model):
         if self.validate_different_vendor() and not self.vendor_approval:
             return self._create_notification_action('Notification', 'Terdapat Vendor yang berbeda dengan MD Vendor')
         self.check_due()
-
-        self._validate_order()
         for order in self:
+            order._validate_npwp()
             order._validate_delivery_amt()
             order._validate_uniform_taxes()
             order.order_line.validate_line()
@@ -2480,6 +2486,7 @@ class SaleOrder(models.Model):
             order.check_data_real_delivery_address()
             order.sale_order_check_approve()
             order._validate_order()
+            order._validate_npwp()
             order.order_line.validate_line()
 
             main_parent = order.partner_id.get_main_parent()
@@ -2665,23 +2672,17 @@ class SaleOrder(models.Model):
     def _set_sppkp_npwp_contact(self):
         partner = self.partner_id.parent_id or self.partner_id
 
-        if not partner.sppkp:
-            partner.sppkp = self.sppkp
-        if not partner.npwp:
-            partner.npwp = self.npwp
+        # if not partner.sppkp:
+        #     partner.sppkp = self.sppkp
+        # if not partner.npwp:
+        #     partner.npwp = self.npwp
         if not partner.email:
             partner.email = self.email
-        if not partner.customer_type:
-            partner.customer_type = self.customer_type
+        # if not partner.customer_type:
+        #     partner.customer_type = self.customer_type
         if not partner.user_id:
             partner.user_id = self.user_id.id
 
-        # if not partner.sppkp or not partner.npwp or not partner.email or partner.customer_type:
-        #     partner.customer_type = self.customer_type
-        #     partner.npwp = self.npwp
-        #     partner.sppkp = self.sppkp
-        #     partner.email = self.email
-
     def _compute_total_margin(self):
         for order in self:
             total_margin = sum(line.item_margin for line in order.order_line if line.product_id)
@@ -3123,52 +3124,6 @@ class SaleOrder(models.Model):
         # order._update_partner_details()
         return order
 
-    # def write(self, vals):
-    # Call the super method to handle the write operation
-    # res = super(SaleOrder, self).write(vals)
-    # self._compute_etrts_date()
-    # Check if the update is coming from a save operation
-    # if any(field in vals for field in ['sppkp', 'npwp', 'email', 'customer_type']):
-    #     self._update_partner_details()
-
-    # return res
-
-    def _update_partner_details(self):
-        for order in self:
-            partner = order.partner_id.parent_id or order.partner_id
-            if partner:
-                # Update partner details
-                partner.sppkp = order.sppkp
-                partner.npwp = order.npwp
-                partner.email = order.email
-                partner.customer_type = order.customer_type
-
-                # Save changes to the partner record
-                partner.write({
-                    'sppkp': partner.sppkp,
-                    'npwp': partner.npwp,
-                    'email': partner.email,
-                    'customer_type': partner.customer_type,
-                })
-
-    # def write(self, vals):
-    #     for order in self:
-    #         if order.state in ['sale', 'cancel']:
-    #             if 'order_line' in vals:
-    #                 new_lines = vals.get('order_line', [])
-    #                 for command in new_lines:
-    #                     if command[0] == 0:  # A new line is being added
-    #                         raise UserError(
-    #                             "SO tidak dapat ditambahkan produk baru karena SO sudah menjadi sale order.")
-    #
-    #     res = super(SaleOrder, self).write(vals)
-    #     # self._check_total_margin_excl_third_party()
-    #     if any(fields in vals for fields in ['delivery_amt', 'carrier_id', 'shipping_cost_covered']):
-    #         self._validate_delivery_amt()
-    #     if any(field in vals for field in ["order_line", "client_order_ref"]):
-    #         self._calculate_etrts_date()
-    #     return res
-    
     # @api.depends('commitment_date')
     def _compute_ready_to_ship_status_detail(self):
         def is_empty(val):
diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index 47a24264..1f2ea1fb 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -71,23 +71,17 @@ class SaleOrderLine(models.Model):
 
             if order_qty > 0:
                 for move in line.move_ids:
-                    # --- CASE 1: Move belum selesai ---
                     if move.state not in ('done', 'cancel'):
                         reserved_qty += move.reserved_availability or 0.0
                         continue
 
-                    # --- CASE 2: Move sudah done ---
                     if move.location_dest_id.usage == 'customer':
-                        # Barang dikirim ke customer
                         delivered_qty += move.quantity_done or 0.0
                     elif move.location_id.usage == 'customer':
-                        # Barang balik dari customer (retur)
                         delivered_qty -= move.quantity_done or 0.0
 
-                # Clamp supaya delivered gak minus
                 delivered_qty = max(delivered_qty, 0)
 
-            # Hitung persen
             line.reserved_percent = min((reserved_qty / order_qty) * 100, 100) if order_qty else 0
             line.delivered_percent = min((delivered_qty / order_qty) * 100, 100) if order_qty else 0
             line.unreserved_percent = max(100 - line.reserved_percent - line.delivered_percent, 0)
diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index 9d7f4028..040db3dd 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -26,8 +26,8 @@
     </template>
 
     <!-- Document Template -->
-<template id="report_purchaseorder_website_document">
-        <t t-call="web.external_layout">
+    <template id="report_purchaseorder_website_document">
+        <t t-call="web.html_container">
             <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)" />
 
             <div class="page">
@@ -41,80 +41,68 @@
                 <h2 class="text-center mb4" style="color:#d32f2f; font-weight:bold;">
                     PURCHASE ORDER
                 </h2>
-                <h4 class="text-center mb32">
+                <h4 class="text-center mb24">
                     No. <span t-field="doc.name"/>
                 </h4>
 
-                <!-- Top Info sejajar -->
-                <div class="row mb16" style="font-size:12px;">
-                    <div class="col-4">
-                        <strong>Term Of Payment:</strong>
-                        <span t-field="doc.payment_term_id.name"/>
-                    </div>
-                    <div class="col-4">
-                        <strong>Order Date:</strong>
-                        <span t-field="doc.date_order" t-options='{"widget": "date"}'/>
-                    </div>
-                    <div class="col-4">
-                        <strong>Responsible:</strong>
-                        <span t-field="doc.user_id"/>
-                    </div>
+                <!-- Info Row -->
+                <div class="row mb16">
+                    <div class="col-4"><strong>Term Of Payment:</strong> <span t-field="doc.payment_term_id.name"/></div>
+                    <div class="col-4"><strong>Order Date:</strong> <span t-field="doc.date_order" t-options='{"widget": "date"}'/></div>
+                    <div class="col-4"><strong>Responsible:</strong> <span t-field="doc.user_id"/></div>
                 </div>
 
-                <!-- Vendor & Shipping Info sejajar -->
-                <div class="row mb32" style="font-size:12px;">
-                    <div class="col-6" style="border:1px solid #ccc; padding:8px;">
+                <!-- Vendor & Delivery Row (Side by Side) -->
+                <div class="row mb24">
+                    <div class="col-6" style="border:1px solid #ccc; padding:8px; margin-right:4px;">
                         <strong>Alamat Pengiriman:</strong><br/>
                         PT Indoteknik (Bandengan 1 Depan)<br/>
                         Jl. Bandengan Utara Komp A 8 B<br/>
                         RT. Penjaringan, Kec. Penjaringan, Jakarta (BELAKANG INDOMARET)<br/>
-                        JK 14440<br/>
-                        Indonesia
+                        JK 14440 - Indonesia
                     </div>
-                    <div class="col-6" style="border:1px solid #ccc; padding:8px;">
+                    <div class="col-6" style="border:1px solid #ccc; padding:8px; margin-left:4px;">
                         <strong>Nama Vendor:</strong><br/>
-                        <div t-field="doc.partner_id"
-                            t-options='{"widget": "contact", "fields": ["address", "name", "phone"],
-                                        "no_marker": True, "phone_icons": True}'/>
+                        <span t-field="doc.partner_id.name"/><br/>
+                        <span t-field="doc.partner_id.street"/><br/>
+                        <span t-field="doc.partner_id.city"/> - <span t-field="doc.partner_id.zip"/>
                     </div>
                 </div>
 
-                <!-- Order Lines -->
-                <table class="table table-sm o_main_table" style="font-size:11px; border:1px solid #000; border-collapse: collapse; width:100%;">
-                    <thead style="display: table-row-group; background:#f5f5f5;">
-                        <tr>
-                            <th style="border:1px solid #000; padding:4px;">Description</th>
-                            <th class="text-right" style="border:1px solid #000; padding:4px;">Quantity</th>
-                            <th class="text-right" style="border:1px solid #000; padding:4px;">Unit Price</th>
-                            <th class="text-right" style="border:1px solid #000; padding:4px;">Taxes</th>
-                            <th class="text-right" style="border:1px solid #000; padding:4px;">Subtotal</th>
+                <!-- Order Lines Table -->
+                <table class="table table-sm o_main_table" style="border-collapse: collapse; width: 100%; margin-top: 12px;">
+                    <thead>
+                        <tr style="background:#f2f2f2;">
+                            <th style="border:1px solid #ccc;">Description</th>
+                            <th style="border:1px solid #ccc;" class="text-right">Quantity</th>
+                            <th style="border:1px solid #ccc;" class="text-right">Unit Price</th>
+                            <th style="border:1px solid #ccc;" class="text-right">Taxes</th>
+                            <th style="border:1px solid #ccc;" class="text-right">Subtotal</th>
                         </tr>
                     </thead>
                     <tbody>
                         <t t-foreach="doc.order_line" t-as="line">
-                            <!-- Main row -->
                             <tr>
-                                <td style="border:1px solid #000; padding:4px;">
+                                <td style="border:1px solid #ccc;">
                                     <span t-field="line.name"/>
                                 </td>
-                                <td class="text-right" style="border:1px solid #000; padding:4px;">
-                                    <span t-field="line.product_qty"/>
-                                    <span t-field="line.product_uom"/>
+                                <td style="border:1px solid #ccc;" class="text-right">
+                                    <span t-field="line.product_qty"/> <span t-field="line.product_uom"/>
                                 </td>
-                                <td class="text-right" style="border:1px solid #000; padding:4px;">
+                                <td style="border:1px solid #ccc;" class="text-right">
                                     <span t-field="line.price_unit"/>
                                 </td>
-                                <td class="text-right" style="border:1px solid #000; padding:4px;">
+                                <td style="border:1px solid #ccc;" class="text-right">
                                     <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.taxes_id))"/>
                                 </td>
-                                <td class="text-right" style="border:1px solid #000; padding:4px;">
+                                <td style="border:1px solid #ccc;" class="text-right">
                                     <span t-field="line.price_subtotal"/>
                                 </td>
                             </tr>
-                            <!-- Website Description row -->
                             <t t-if="line.product_id.website_description">
                                 <tr>
-                                    <td colspan="5" style="border:1px solid #000; padding:6px; font-size:10px; color:#555;">
+                                    <!-- Website Description tanpa border, tapi diberi padding agar rapih -->
+                                    <td colspan="5" style="padding:6px 12px; font-size:10px; background:#fafafa;">
                                         <div t-raw="line.product_id.website_description"/>
                                     </td>
                                 </tr>
@@ -124,27 +112,21 @@
                 </table>
 
                 <!-- Totals -->
-                <div class="clearfix">
+                <div class="clearfix mt16">
                     <div class="row">
                         <div class="col-4 ml-auto">
-                            <table class="table table-sm" style="border:1px solid #000; border-collapse: collapse; width:100%;">
+                            <table class="table table-sm">
                                 <tr>
-                                    <td style="border:1px solid #000; padding:4px;"><strong>Subtotal</strong></td>
-                                    <td class="text-right" style="border:1px solid #000; padding:4px;">
-                                        <span t-field="doc.amount_untaxed"/>
-                                    </td>
+                                    <td><strong>Subtotal</strong></td>
+                                    <td class="text-right"><span t-field="doc.amount_untaxed"/></td>
                                 </tr>
                                 <tr>
-                                    <td style="border:1px solid #000; padding:4px;">Taxes</td>
-                                    <td class="text-right" style="border:1px solid #000; padding:4px;">
-                                        <span t-field="doc.amount_tax"/>
-                                    </td>
+                                    <td>Taxes</td>
+                                    <td class="text-right"><span t-field="doc.amount_tax"/></td>
                                 </tr>
                                 <tr class="o_total">
-                                    <td style="border:1px solid #000; padding:4px;"><strong>Total</strong></td>
-                                    <td class="text-right" style="border:1px solid #000; padding:4px;">
-                                        <span t-field="doc.amount_total"/>
-                                    </td>
+                                    <td><strong>Total</strong></td>
+                                    <td class="text-right"><span t-field="doc.amount_total"/></td>
                                 </tr>
                             </table>
                         </div>
@@ -152,11 +134,12 @@
                 </div>
 
                 <!-- Notes -->
-                <div class="mt32" style="font-size:11px;">
+                <div class="mt32">
                     <p t-field="doc.notes"/>
                 </div>
             </div>
         </t>
     </template>
 
+
 </odoo>
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 7d5be3b7..c32151d8 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -36,9 +36,9 @@
                     <field name="pareto_status"/>
                     <field name="digital_invoice_tax"/>
                 </field>
-                <field name="nama_wajib_pajak" position="attributes">
+                <!-- <field name="nama_wajib_pajak" position="attributes">
                     <attribute name="required">1</attribute>
-                </field>
+                </field> -->
                 <field name="kota_id" position="attributes">
                     <attribute name="required">0</attribute>
                 </field>
@@ -48,14 +48,14 @@
                 <field name="kelurahan_id" position="attributes">
                     <attribute name="required">0</attribute>
                 </field>
-                <field name="npwp" position="attributes">
+                <!-- <field name="npwp" position="attributes">
                     <attribute name="required">1</attribute>
                 </field>
                 <field name="alamat_lengkap_text" position="attributes">
                     <attribute name="required">1</attribute>
-                </field>
+                </field> -->
                 <field name="npwp" position="before">
-                    <field name="customer_type" required="1"/>
+                    <field name="customer_type"/>
                 </field>
                 <field name="alamat_lengkap_text" position="after">
                     <field name="nitku" />
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 326fd560..44da3e13 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -148,9 +148,9 @@
                     <field name="pareto_status"/>
                 </field>
                 <field name="analytic_account_id" position="after">
-                    <field name="customer_type" readonly="1"/>
-                    <field name="npwp" placeholder='99.999.999.9-999.999' readonly="1"/>
-                    <field name="sppkp" attrs="{'required': [('customer_type', '=', 'pkp')]}" readonly="1"/>
+                    <field name="customer_type"/>
+                    <field name="npwp" placeholder='99.999.999.9-999.999'/>
+                    <field name="sppkp" attrs="{'required': [('customer_type', '=', 'pkp')]}"/>
                     <field name="email" required="1"/>
                     <field name="unreserve_id"/>
                     <field name="due_id" readonly="1"/>
-- 
cgit v1.2.3


From d80fad0504e3f7c058c36203161a90227ec6d575 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 12 Sep 2025 15:52:12 +0700
Subject: po report

---
 indoteknik_custom/report/purchase_report.xml | 40 +++++++++++++++-------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index 040db3dd..784675d8 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -25,43 +25,42 @@
         </t>
     </template>
 
-    <!-- Document Template -->
     <template id="report_purchaseorder_website_document">
         <t t-call="web.html_container">
             <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)" />
+            <!-- Custom Header -->
+            <div class="mb24">
+                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2498521"
+                     style="width:100%; max-height:100px; object-fit:contain;"/>
+            </div>
 
             <div class="page">
-                <!-- Header Image -->
-                <div class="mb16">
-                    <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2498521"
-                        style="width:100%; max-height:100px; object-fit:contain;"/>
-                </div>
 
                 <!-- Title -->
                 <h2 class="text-center mb4" style="color:#d32f2f; font-weight:bold;">
                     PURCHASE ORDER
                 </h2>
-                <h4 class="text-center mb24">
+                <h4 class="text-center mb32">
                     No. <span t-field="doc.name"/>
                 </h4>
 
-                <!-- Info Row -->
-                <div class="row mb16">
-                    <div class="col-4"><strong>Term Of Payment:</strong> <span t-field="doc.payment_term_id.name"/></div>
-                    <div class="col-4"><strong>Order Date:</strong> <span t-field="doc.date_order" t-options='{"widget": "date"}'/></div>
-                    <div class="col-4"><strong>Responsible:</strong> <span t-field="doc.user_id"/></div>
+                <!-- Payment, Date, Responsible -->
+                <div class="mb24" style="display:flex; justify-content:space-between; font-size:14px;">
+                    <div><strong>Term Of Payment:</strong> <span t-field="doc.payment_term_id.name"/></div>
+                    <div><strong>Order Date:</strong> <span t-field="doc.date_order" t-options='{"widget": "date"}'/></div>
+                    <div><strong>Responsible:</strong> <span t-field="doc.user_id"/></div>
                 </div>
 
-                <!-- Vendor & Delivery Row (Side by Side) -->
-                <div class="row mb24">
-                    <div class="col-6" style="border:1px solid #ccc; padding:8px; margin-right:4px;">
+                <!-- Vendor & Delivery -->
+                <div class="mb32" style="display:flex; gap:16px;">
+                    <div style="flex:1; border:1px solid #ccc; padding:10px;">
                         <strong>Alamat Pengiriman:</strong><br/>
                         PT Indoteknik (Bandengan 1 Depan)<br/>
                         Jl. Bandengan Utara Komp A 8 B<br/>
                         RT. Penjaringan, Kec. Penjaringan, Jakarta (BELAKANG INDOMARET)<br/>
                         JK 14440 - Indonesia
                     </div>
-                    <div class="col-6" style="border:1px solid #ccc; padding:8px; margin-left:4px;">
+                    <div style="flex:1; border:1px solid #ccc; padding:10px;">
                         <strong>Nama Vendor:</strong><br/>
                         <span t-field="doc.partner_id.name"/><br/>
                         <span t-field="doc.partner_id.street"/><br/>
@@ -101,8 +100,7 @@
                             </tr>
                             <t t-if="line.product_id.website_description">
                                 <tr>
-                                    <!-- Website Description tanpa border, tapi diberi padding agar rapih -->
-                                    <td colspan="5" style="padding:6px 12px; font-size:10px; background:#fafafa;">
+                                    <td colspan="5" style="padding:8px 12px; font-size:11px; background:#fafafa; border-left:1px solid #ccc; border-right:1px solid #ccc; border-bottom:1px solid #ccc;">
                                         <div t-raw="line.product_id.website_description"/>
                                     </td>
                                 </tr>
@@ -112,7 +110,7 @@
                 </table>
 
                 <!-- Totals -->
-                <div class="clearfix mt16">
+                <div class="clearfix mt24">
                     <div class="row">
                         <div class="col-4 ml-auto">
                             <table class="table table-sm">
@@ -138,6 +136,10 @@
                     <p t-field="doc.notes"/>
                 </div>
             </div>
+        <div class="footer">
+            <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2859765"
+            style="width:100%; display: block;"/>
+        </div>
         </t>
     </template>
 
-- 
cgit v1.2.3


From d62c1d36de434fc2c40984d1b860c424bc6ce241 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 12 Sep 2025 16:20:33 +0700
Subject: test po report

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

diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index 784675d8..275dd526 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -28,79 +28,84 @@
     <template id="report_purchaseorder_website_document">
         <t t-call="web.html_container">
             <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)" />
-            <!-- Custom Header -->
-            <div class="mb24">
+
+            <!-- HEADER LOGO -->
+            <div style="margin-bottom:20px;">
                 <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2498521"
-                     style="width:100%; max-height:100px; object-fit:contain;"/>
+                    style="width:100%; height:auto; display:block;"/>
             </div>
 
             <div class="page">
 
-                <!-- Title -->
-                <h2 class="text-center mb4" style="color:#d32f2f; font-weight:bold;">
+                <!-- TITLE -->
+                <h2 style="text-align:center; margin:0; color:#d32f2f; font-weight:bold;">
                     PURCHASE ORDER
                 </h2>
-                <h4 class="text-center mb32">
+                <h4 style="text-align:center; margin:0 0 20px 0;">
                     No. <span t-field="doc.name"/>
                 </h4>
 
-                <!-- Payment, Date, Responsible -->
-                <div class="mb24" style="display:flex; justify-content:space-between; font-size:14px;">
-                    <div><strong>Term Of Payment:</strong> <span t-field="doc.payment_term_id.name"/></div>
-                    <div><strong>Order Date:</strong> <span t-field="doc.date_order" t-options='{"widget": "date"}'/></div>
-                    <div><strong>Responsible:</strong> <span t-field="doc.user_id"/></div>
-                </div>
+                <!-- TOP INFO (Term, Date, Responsible) -->
+                <table style="width:100%; margin-bottom:16px; font-size:14px;">
+                    <tr>
+                        <td><strong>Term Of Payment:</strong> <span t-field="doc.payment_term_id.name"/></td>
+                        <td><strong>Order Date:</strong> <span t-field="doc.date_order" t-options='{"widget": "date"}'/></td>
+                        <td><strong>Responsible:</strong> <span t-field="doc.user_id"/></td>
+                    </tr>
+                </table>
 
-                <!-- Vendor & Delivery -->
-                <div class="mb32" style="display:flex; gap:16px;">
-                    <div style="flex:1; border:1px solid #ccc; padding:10px;">
-                        <strong>Alamat Pengiriman:</strong><br/>
-                        PT Indoteknik (Bandengan 1 Depan)<br/>
-                        Jl. Bandengan Utara Komp A 8 B<br/>
-                        RT. Penjaringan, Kec. Penjaringan, Jakarta (BELAKANG INDOMARET)<br/>
-                        JK 14440 - Indonesia
-                    </div>
-                    <div style="flex:1; border:1px solid #ccc; padding:10px;">
-                        <strong>Nama Vendor:</strong><br/>
-                        <span t-field="doc.partner_id.name"/><br/>
-                        <span t-field="doc.partner_id.street"/><br/>
-                        <span t-field="doc.partner_id.city"/> - <span t-field="doc.partner_id.zip"/>
-                    </div>
-                </div>
+                <!-- VENDOR & DELIVERY SIDE BY SIDE -->
+                <table style="width:100%; margin-bottom:24px; border-collapse:separate; border-spacing:16px 0;">
+                    <tr>
+                        <td style="width:50%; border:1px solid #ccc; padding:8px; vertical-align:top;">
+                            <strong>Alamat Pengiriman:</strong><br/>
+                            PT Indoteknik (Bandengan 1 Depan)<br/>
+                            Jl. Bandengan Utara Komp A 8 B<br/>
+                            RT. Penjaringan, Kec. Penjaringan, Jakarta (BELAKANG INDOMARET)<br/>
+                            JK 14440 - Indonesia
+                        </td>
+                        <td style="width:50%; border:1px solid #ccc; padding:8px; vertical-align:top;">
+                            <strong>Nama Vendor:</strong><br/>
+                            <span t-field="doc.partner_id.name"/><br/>
+                            <span t-field="doc.partner_id.street"/><br/>
+                            <span t-field="doc.partner_id.city"/> - <span t-field="doc.partner_id.zip"/>
+                        </td>
+                    </tr>
+                </table>
 
-                <!-- Order Lines Table -->
-                <table class="table table-sm o_main_table" style="border-collapse: collapse; width: 100%; margin-top: 12px;">
+                <!-- ORDER LINES TABLE -->
+                <table style="border-collapse:collapse; width:100%; margin-top:16px;">
                     <thead>
                         <tr style="background:#f2f2f2;">
-                            <th style="border:1px solid #ccc;">Description</th>
-                            <th style="border:1px solid #ccc;" class="text-right">Quantity</th>
-                            <th style="border:1px solid #ccc;" class="text-right">Unit Price</th>
-                            <th style="border:1px solid #ccc;" class="text-right">Taxes</th>
-                            <th style="border:1px solid #ccc;" class="text-right">Subtotal</th>
+                            <th style="border:1px solid #ccc; padding:4px;">Description</th>
+                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Quantity</th>
+                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Unit Price</th>
+                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Taxes</th>
+                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Subtotal</th>
                         </tr>
                     </thead>
                     <tbody>
                         <t t-foreach="doc.order_line" t-as="line">
                             <tr>
-                                <td style="border:1px solid #ccc;">
+                                <td style="border:1px solid #ccc; padding:4px;">
                                     <span t-field="line.name"/>
                                 </td>
-                                <td style="border:1px solid #ccc;" class="text-right">
+                                <td style="border:1px solid #ccc; padding:4px; text-align:right;">
                                     <span t-field="line.product_qty"/> <span t-field="line.product_uom"/>
                                 </td>
-                                <td style="border:1px solid #ccc;" class="text-right">
+                                <td style="border:1px solid #ccc; padding:4px; text-align:right;">
                                     <span t-field="line.price_unit"/>
                                 </td>
-                                <td style="border:1px solid #ccc;" class="text-right">
+                                <td style="border:1px solid #ccc; padding:4px; text-align:right;">
                                     <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.taxes_id))"/>
                                 </td>
-                                <td style="border:1px solid #ccc;" class="text-right">
+                                <td style="border:1px solid #ccc; padding:4px; text-align:right;">
                                     <span t-field="line.price_subtotal"/>
                                 </td>
                             </tr>
                             <t t-if="line.product_id.website_description">
                                 <tr>
-                                    <td colspan="5" style="padding:8px 12px; font-size:11px; background:#fafafa; border-left:1px solid #ccc; border-right:1px solid #ccc; border-bottom:1px solid #ccc;">
+                                    <td colspan="5" style="padding:8px 12px; font-size:11px; background:#fafafa; border-left:1px solid #ccc; border-right:1px solid #ccc;">
                                         <div t-raw="line.product_id.website_description"/>
                                     </td>
                                 </tr>
@@ -109,39 +114,34 @@
                     </tbody>
                 </table>
 
-                <!-- Totals -->
-                <div class="clearfix mt24">
-                    <div class="row">
-                        <div class="col-4 ml-auto">
-                            <table class="table table-sm">
-                                <tr>
-                                    <td><strong>Subtotal</strong></td>
-                                    <td class="text-right"><span t-field="doc.amount_untaxed"/></td>
-                                </tr>
-                                <tr>
-                                    <td>Taxes</td>
-                                    <td class="text-right"><span t-field="doc.amount_tax"/></td>
-                                </tr>
-                                <tr class="o_total">
-                                    <td><strong>Total</strong></td>
-                                    <td class="text-right"><span t-field="doc.amount_total"/></td>
-                                </tr>
-                            </table>
-                        </div>
-                    </div>
-                </div>
+                <!-- TOTALS -->
+                <table style="margin-top:20px; margin-left:auto; width:40%; font-size:14px;">
+                    <tr>
+                        <td><strong>Subtotal</strong></td>
+                        <td style="text-align:right;"><span t-field="doc.amount_untaxed"/></td>
+                    </tr>
+                    <tr>
+                        <td>Taxes</td>
+                        <td style="text-align:right;"><span t-field="doc.amount_tax"/></td>
+                    </tr>
+                    <tr>
+                        <td><strong>Total</strong></td>
+                        <td style="text-align:right;"><span t-field="doc.amount_total"/></td>
+                    </tr>
+                </table>
 
-                <!-- Notes -->
-                <div class="mt32">
+                <!-- NOTES -->
+                <div style="margin-top:24px;">
                     <p t-field="doc.notes"/>
                 </div>
             </div>
-        <div class="footer">
-            <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2859765"
-            style="width:100%; display: block;"/>
-        </div>
+
+            <!-- FOOTER IMAGE -->
+            <div style="margin-top:30px;">
+                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2859765"
+                    style="width:100%; display:block;"/>
+            </div>
         </t>
     </template>
 
-
 </odoo>
-- 
cgit v1.2.3


From 43e1e37ec252e6f46e885cb5055f69a3b01ba9d1 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 12 Sep 2025 17:05:11 +0700
Subject: push po report

---
 indoteknik_custom/report/purchase_report.xml | 137 +++++++++++++++++++--------
 1 file changed, 96 insertions(+), 41 deletions(-)

diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index 275dd526..265db28b 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -27,16 +27,80 @@
 
     <template id="report_purchaseorder_website_document">
         <t t-call="web.html_container">
-            <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)" />
+            <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)"/>
 
-            <!-- HEADER LOGO -->
-            <div style="margin-bottom:20px;">
-                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2498521"
-                    style="width:100%; height:auto; display:block;"/>
-            </div>
+            <!-- IMPORTANT: style harus ada di top-level template -->
+            <style>
+                /* Sesuaikan angka ini menurut tinggi header/footer image lo */
+                /* margin-top harus = (kira-kira) tinggi header + spacing */
+                @page {
+                    size: A4;
+                    margin: 140px 20px 110px 20px; /* top right bottom left */
+                }
+
+                html, body {
+                    margin: 0;
+                    padding: 0;
+                    font-family: Arial, "Helvetica Neue", Helvetica, sans-serif;
+                    color: #222;
+                }
+
+                /* Tarik header ke atas luar area konten */
+                .report-header {
+                    position: fixed;
+                    top: -140px;            /* NEGATIVE of @page margin-top */
+                    left: 0;
+                    right: 0;
+                    height: 120px;         /* atur sesuai tinggi gambar header */
+                    z-index: 9999;
+                }
+                .report-header img {
+                    display:block;
+                    width:100%;
+                    height:auto;
+                }
+
+                /* Tarik footer ke bawah luar area konten */
+                .report-footer {
+                    position: fixed;
+                    bottom: -110px;        /* NEGATIVE of @page margin-bottom */
+                    left: 0;
+                    right: 0;
+                    height: 90px;          /* atur sesuai tinggi gambar footer */
+                    z-index: 9999;
+                }
+                .report-footer img {
+                    display:block;
+                    width:100%;
+                    height:auto;
+                }
+
+                /* Konten utama berada di antara margin */
+                .po-content {
+                    font-size: 13px;
+                    /* jangan kasih margin-top besar di sini; @page sudah atur ruang */
+                }
+
+                /* Biar <thead> diulang tiap halaman */
+                thead { display: table-header-group; }
+                tfoot { display: table-footer-group; }
 
-            <div class="page">
+                /* Hindari tabel terpotong di tengah baris */
+                table { border-collapse: collapse; width:100%; }
+                tr { page-break-inside: avoid; break-inside: avoid; }
 
+                /* Styling kecil biar rapi */
+                th, td { border:1px solid #ccc; padding:6px; vertical-align:top; }
+                th { background:#f2f2f2; font-weight:600; }
+            </style>
+
+            <!-- HEADER (pakai div, bukan <header>) -->
+            <div class="report-header">
+                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2498521" alt="header"/>
+            </div>
+
+            <!-- PAGE CONTENT -->
+            <div class="po-content">
                 <!-- TITLE -->
                 <h2 style="text-align:center; margin:0; color:#d32f2f; font-weight:bold;">
                     PURCHASE ORDER
@@ -45,8 +109,8 @@
                     No. <span t-field="doc.name"/>
                 </h4>
 
-                <!-- TOP INFO (Term, Date, Responsible) -->
-                <table style="width:100%; margin-bottom:16px; font-size:14px;">
+                <!-- TOP INFO -->
+                <table style="margin-bottom:16px; font-size:14px;">
                     <tr>
                         <td><strong>Term Of Payment:</strong> <span t-field="doc.payment_term_id.name"/></td>
                         <td><strong>Order Date:</strong> <span t-field="doc.date_order" t-options='{"widget": "date"}'/></td>
@@ -54,17 +118,17 @@
                     </tr>
                 </table>
 
-                <!-- VENDOR & DELIVERY SIDE BY SIDE -->
-                <table style="width:100%; margin-bottom:24px; border-collapse:separate; border-spacing:16px 0;">
+                <!-- VENDOR & DELIVERY -->
+                <table style="margin-bottom:24px; border-collapse:separate; border-spacing:16px 0;">
                     <tr>
-                        <td style="width:50%; border:1px solid #ccc; padding:8px; vertical-align:top;">
+                        <td style="width:50%; padding:8px;">
                             <strong>Alamat Pengiriman:</strong><br/>
                             PT Indoteknik (Bandengan 1 Depan)<br/>
                             Jl. Bandengan Utara Komp A 8 B<br/>
                             RT. Penjaringan, Kec. Penjaringan, Jakarta (BELAKANG INDOMARET)<br/>
                             JK 14440 - Indonesia
                         </td>
-                        <td style="width:50%; border:1px solid #ccc; padding:8px; vertical-align:top;">
+                        <td style="width:50%; padding:8px;">
                             <strong>Nama Vendor:</strong><br/>
                             <span t-field="doc.partner_id.name"/><br/>
                             <span t-field="doc.partner_id.street"/><br/>
@@ -73,39 +137,29 @@
                     </tr>
                 </table>
 
-                <!-- ORDER LINES TABLE -->
-                <table style="border-collapse:collapse; width:100%; margin-top:16px;">
+                <!-- ORDER LINES -->
+                <table style="margin-top:16px;">
                     <thead>
-                        <tr style="background:#f2f2f2;">
-                            <th style="border:1px solid #ccc; padding:4px;">Description</th>
-                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Quantity</th>
-                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Unit Price</th>
-                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Taxes</th>
-                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Subtotal</th>
+                        <tr>
+                            <th>Description</th>
+                            <th style="text-align:right;">Quantity</th>
+                            <th style="text-align:right;">Unit Price</th>
+                            <th style="text-align:right;">Taxes</th>
+                            <th style="text-align:right;">Subtotal</th>
                         </tr>
                     </thead>
                     <tbody>
                         <t t-foreach="doc.order_line" t-as="line">
                             <tr>
-                                <td style="border:1px solid #ccc; padding:4px;">
-                                    <span t-field="line.name"/>
-                                </td>
-                                <td style="border:1px solid #ccc; padding:4px; text-align:right;">
-                                    <span t-field="line.product_qty"/> <span t-field="line.product_uom"/>
-                                </td>
-                                <td style="border:1px solid #ccc; padding:4px; text-align:right;">
-                                    <span t-field="line.price_unit"/>
-                                </td>
-                                <td style="border:1px solid #ccc; padding:4px; text-align:right;">
-                                    <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.taxes_id))"/>
-                                </td>
-                                <td style="border:1px solid #ccc; padding:4px; text-align:right;">
-                                    <span t-field="line.price_subtotal"/>
-                                </td>
+                                <td><span t-field="line.name"/></td>
+                                <td style="text-align:right;"><span t-field="line.product_qty"/> <span t-field="line.product_uom"/></td>
+                                <td style="text-align:right;"><span t-field="line.price_unit"/></td>
+                                <td style="text-align:right;"><span t-esc="', '.join(map(lambda x: (x.description or x.name), line.taxes_id))"/></td>
+                                <td style="text-align:right;"><span t-field="line.price_subtotal"/></td>
                             </tr>
                             <t t-if="line.product_id.website_description">
                                 <tr>
-                                    <td colspan="5" style="padding:8px 12px; font-size:11px; background:#fafafa; border-left:1px solid #ccc; border-right:1px solid #ccc;">
+                                    <td colspan="5" style="padding:8px 12px; font-size:11px; background:#fafafa;">
                                         <div t-raw="line.product_id.website_description"/>
                                     </td>
                                 </tr>
@@ -136,12 +190,13 @@
                 </div>
             </div>
 
-            <!-- FOOTER IMAGE -->
-            <div style="margin-top:30px;">
-                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2859765"
-                    style="width:100%; display:block;"/>
+            <!-- FOOTER (pakai div, bukan <footer>) -->
+            <div class="report-footer">
+                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2859765" alt="footer"/>
             </div>
         </t>
     </template>
 
+
+
 </odoo>
-- 
cgit v1.2.3


From 5d016b74e3de4d83cbe91fae56f8dc01e7e87879 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 12 Sep 2025 17:10:38 +0700
Subject: push report po

---
 indoteknik_custom/report/purchase_report.xml | 131 ++++++++-------------------
 1 file changed, 39 insertions(+), 92 deletions(-)

diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index 265db28b..cd8af78a 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -27,80 +27,17 @@
 
     <template id="report_purchaseorder_website_document">
         <t t-call="web.html_container">
-            <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)"/>
+            <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)" />
 
-            <!-- IMPORTANT: style harus ada di top-level template -->
-            <style>
-                /* Sesuaikan angka ini menurut tinggi header/footer image lo */
-                /* margin-top harus = (kira-kira) tinggi header + spacing */
-                @page {
-                    size: A4;
-                    margin: 140px 20px 110px 20px; /* top right bottom left */
-                }
-
-                html, body {
-                    margin: 0;
-                    padding: 0;
-                    font-family: Arial, "Helvetica Neue", Helvetica, sans-serif;
-                    color: #222;
-                }
-
-                /* Tarik header ke atas luar area konten */
-                .report-header {
-                    position: fixed;
-                    top: -140px;            /* NEGATIVE of @page margin-top */
-                    left: 0;
-                    right: 0;
-                    height: 120px;         /* atur sesuai tinggi gambar header */
-                    z-index: 9999;
-                }
-                .report-header img {
-                    display:block;
-                    width:100%;
-                    height:auto;
-                }
-
-                /* Tarik footer ke bawah luar area konten */
-                .report-footer {
-                    position: fixed;
-                    bottom: -110px;        /* NEGATIVE of @page margin-bottom */
-                    left: 0;
-                    right: 0;
-                    height: 90px;          /* atur sesuai tinggi gambar footer */
-                    z-index: 9999;
-                }
-                .report-footer img {
-                    display:block;
-                    width:100%;
-                    height:auto;
-                }
-
-                /* Konten utama berada di antara margin */
-                .po-content {
-                    font-size: 13px;
-                    /* jangan kasih margin-top besar di sini; @page sudah atur ruang */
-                }
-
-                /* Biar <thead> diulang tiap halaman */
-                thead { display: table-header-group; }
-                tfoot { display: table-footer-group; }
-
-                /* Hindari tabel terpotong di tengah baris */
-                table { border-collapse: collapse; width:100%; }
-                tr { page-break-inside: avoid; break-inside: avoid; }
-
-                /* Styling kecil biar rapi */
-                th, td { border:1px solid #ccc; padding:6px; vertical-align:top; }
-                th { background:#f2f2f2; font-weight:600; }
-            </style>
-
-            <!-- HEADER (pakai div, bukan <header>) -->
-            <div class="report-header">
-                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2498521" alt="header"/>
+            <!-- Header -->
+            <div class="header">
+                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2498521"
+                    style="width:100%; display: block;"/>
             </div>
 
+
             <!-- PAGE CONTENT -->
-            <div class="po-content">
+            <div class="article" style="margin: 0 1.5cm 0 1.5cm; ">
                 <!-- TITLE -->
                 <h2 style="text-align:center; margin:0; color:#d32f2f; font-weight:bold;">
                     PURCHASE ORDER
@@ -110,7 +47,7 @@
                 </h4>
 
                 <!-- TOP INFO -->
-                <table style="margin-bottom:16px; font-size:14px;">
+                <table style="width:100%; margin-bottom:16px; font-size:14px;">
                     <tr>
                         <td><strong>Term Of Payment:</strong> <span t-field="doc.payment_term_id.name"/></td>
                         <td><strong>Order Date:</strong> <span t-field="doc.date_order" t-options='{"widget": "date"}'/></td>
@@ -119,16 +56,16 @@
                 </table>
 
                 <!-- VENDOR & DELIVERY -->
-                <table style="margin-bottom:24px; border-collapse:separate; border-spacing:16px 0;">
+                <table style="width:100%; margin-bottom:24px; border-collapse:separate; border-spacing:16px 0;">
                     <tr>
-                        <td style="width:50%; padding:8px;">
+                        <td style="width:50%; border:1px solid #ccc; padding:8px; vertical-align:top;">
                             <strong>Alamat Pengiriman:</strong><br/>
                             PT Indoteknik (Bandengan 1 Depan)<br/>
                             Jl. Bandengan Utara Komp A 8 B<br/>
                             RT. Penjaringan, Kec. Penjaringan, Jakarta (BELAKANG INDOMARET)<br/>
                             JK 14440 - Indonesia
                         </td>
-                        <td style="width:50%; padding:8px;">
+                        <td style="width:50%; border:1px solid #ccc; padding:8px; vertical-align:top;">
                             <strong>Nama Vendor:</strong><br/>
                             <span t-field="doc.partner_id.name"/><br/>
                             <span t-field="doc.partner_id.street"/><br/>
@@ -138,28 +75,38 @@
                 </table>
 
                 <!-- ORDER LINES -->
-                <table style="margin-top:16px;">
+                <table style="border-collapse:collapse; width:100%; margin-top:16px;">
                     <thead>
-                        <tr>
-                            <th>Description</th>
-                            <th style="text-align:right;">Quantity</th>
-                            <th style="text-align:right;">Unit Price</th>
-                            <th style="text-align:right;">Taxes</th>
-                            <th style="text-align:right;">Subtotal</th>
+                        <tr style="background:#f2f2f2;">
+                            <th style="border:1px solid #ccc; padding:4px;">Description</th>
+                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Quantity</th>
+                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Unit Price</th>
+                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Taxes</th>
+                            <th style="border:1px solid #ccc; padding:4px; text-align:right;">Subtotal</th>
                         </tr>
                     </thead>
                     <tbody>
                         <t t-foreach="doc.order_line" t-as="line">
                             <tr>
-                                <td><span t-field="line.name"/></td>
-                                <td style="text-align:right;"><span t-field="line.product_qty"/> <span t-field="line.product_uom"/></td>
-                                <td style="text-align:right;"><span t-field="line.price_unit"/></td>
-                                <td style="text-align:right;"><span t-esc="', '.join(map(lambda x: (x.description or x.name), line.taxes_id))"/></td>
-                                <td style="text-align:right;"><span t-field="line.price_subtotal"/></td>
+                                <td style="border:1px solid #ccc; padding:4px;">
+                                    <span t-field="line.name"/>
+                                </td>
+                                <td style="border:1px solid #ccc; padding:4px; text-align:right;">
+                                    <span t-field="line.product_qty"/> <span t-field="line.product_uom"/>
+                                </td>
+                                <td style="border:1px solid #ccc; padding:4px; text-align:right;">
+                                    <span t-field="line.price_unit"/>
+                                </td>
+                                <td style="border:1px solid #ccc; padding:4px; text-align:right;">
+                                    <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.taxes_id))"/>
+                                </td>
+                                <td style="border:1px solid #ccc; padding:4px; text-align:right;">
+                                    <span t-field="line.price_subtotal"/>
+                                </td>
                             </tr>
                             <t t-if="line.product_id.website_description">
                                 <tr>
-                                    <td colspan="5" style="padding:8px 12px; font-size:11px; background:#fafafa;">
+                                    <td colspan="5" style="padding:8px 12px; font-size:11px; background:#fafafa; border-left:1px solid #ccc; border-right:1px solid #ccc;">
                                         <div t-raw="line.product_id.website_description"/>
                                     </td>
                                 </tr>
@@ -189,14 +136,14 @@
                     <p t-field="doc.notes"/>
                 </div>
             </div>
-
-            <!-- FOOTER (pakai div, bukan <footer>) -->
-            <div class="report-footer">
-                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2859765" alt="footer"/>
+        <!-- STATIC FOOTER -->
+            <div class="footer">
+                <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2859765"
+                    style="width:100%; display: block;"/>
             </div>
+
         </t>
     </template>
 
 
-
 </odoo>
-- 
cgit v1.2.3