From fa2c8cc7b00e963e740307484c174961f61ffc84 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 5 Jun 2025 08:35:39 +0700
Subject: (andri) add field Journal Uang Muka di PO dan Purchase Order pada CAB

---
 indoteknik_custom/models/account_move.py       | 11 +++++++++++
 indoteknik_custom/models/purchase_order.py     |  2 +-
 indoteknik_custom/models/uangmuka_pembelian.py |  2 ++
 indoteknik_custom/views/account_move.xml       |  1 +
 indoteknik_custom/views/purchase_order.xml     |  1 +
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index 30de67be..24cedc34 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -68,6 +68,17 @@ class AccountMove(models.Model):
     purchase_order_id = fields.Many2one('purchase.order', string='Purchase Order')
     length_of_payment = fields.Integer(string="Length of Payment", compute='compute_length_of_payment')
 
+    def name_get(self):
+        result = []
+        for move in self:
+            if move.move_type == 'entry':
+                # Tampilkan nomor CAB (name)
+                result.append((move.id, move.name))
+            else:
+                # Gunakan default display
+                result.append((move.id, move.display_name))
+        return result
+
     def compute_length_of_payment(self):
         for rec in self:
             payment_term = rec.invoice_payment_term_id.line_ids[0].days
diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 240289bf..0696dd9f 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -65,7 +65,7 @@ class PurchaseOrder(models.Model):
     sale_order = fields.Char(string='Sale Order')
     matches_so = fields.Many2many('sale.order', string='Matches SO', compute='_compute_matches_so')
     is_create_uangmuka = fields.Boolean(string='Uang Muka?')
-    move_id = fields.Many2one('account.move', string='Account Move')
+    move_id = fields.Many2one('account.move', string='Journal Entries Uang Muka', domain=[('move_type', '=', 'entry')])
     logbook_bill_id = fields.Many2one('report.logbook.bill', string='Logbook Bill')
     status_printed = fields.Selection([
         ('not_printed', 'Belum Print'),
diff --git a/indoteknik_custom/models/uangmuka_pembelian.py b/indoteknik_custom/models/uangmuka_pembelian.py
index ba41f814..13d51dcf 100644
--- a/indoteknik_custom/models/uangmuka_pembelian.py
+++ b/indoteknik_custom/models/uangmuka_pembelian.py
@@ -57,6 +57,8 @@ class UangmukaPembelian(models.TransientModel):
 
             account_move = request.env['account.move'].create([param_header])
             _logger.info('Success Create Uang Muka Pembelian %s' % account_move.name)
+            account_move.purchase_order_id = order.id # isi field purchase_order_id
+            
             if order.partner_id.parent_id:
                 partner_id = order.partner_id.parent_id.id
             else:
diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 46737a40..9217cc2a 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -31,6 +31,7 @@
                 </field>
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
+                    <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/>
                 </field>
                 <field name="partner_shipping_id" position="before">
                     <field name="real_invoice_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 0fbbb5e7..99362798 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -65,6 +65,7 @@
                     <field name="total_cost_service" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
                     <field name="total_delivery_amt" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
                     <field name="product_bom_id"/>
+                    <field name="move_id" domain="[('move_type','=','entry')]" context="{'form_view_ref': 'account.view_move_form'}" options="{'no_create': True}"/>
                 </field>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
-- 
cgit v1.2.3


From c43cba9dd205a3f08343f79233d3af6f5ab189ff Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 5 Jun 2025 08:47:31 +0700
Subject: (andri) penyesuaian value field CAB ketika masi dalam keadaan draft

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

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index 24cedc34..29368089 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -72,10 +72,14 @@ class AccountMove(models.Model):
         result = []
         for move in self:
             if move.move_type == 'entry':
-                # Tampilkan nomor CAB (name)
-                result.append((move.id, move.name))
+                # Jika masih draft, tampilkan 'Draft CAB'
+                if move.state == 'draft':
+                    label = 'Draft CAB'
+                else:
+                    label = move.name 
+                result.append((move.id, label))
             else:
-                # Gunakan default display
+                # Untuk invoice dan lainnya, pakai default
                 result.append((move.id, move.display_name))
         return result
 
-- 
cgit v1.2.3


From 55fb073416a7f8504c3819178aa7b6883304335f Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 5 Jun 2025 10:53:30 +0700
Subject: (andri) merubah peletakan CAB menjadi berada di atas sebelah tombol
 receipt

---
 indoteknik_custom/models/purchase_order.py | 14 ++++++++++++++
 indoteknik_custom/views/purchase_order.xml | 13 +++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 0696dd9f..27f1aebd 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -89,6 +89,20 @@ class PurchaseOrder(models.Model):
     store_name = fields.Char(string='Nama Toko')
     purchase_order_count = fields.Integer('Purchase Order Count', related='partner_id.purchase_order_count')
 
+    def action_view_journal_uangmuka(self):
+        self.ensure_one()
+        if not self.move_id:
+            raise UserError("Journal Uang Muka belum tersedia.")
+
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Journal Entry',
+            'res_model': 'account.move',
+            'res_id': self.move_id.id,
+            'view_mode': 'form',
+            'target': 'current',
+        }
+
     # cek payment term
     def _check_payment_term(self):
         _logger.info("Check Payment Term Terpanggil")
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 99362798..12ad6864 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -14,6 +14,19 @@
                             attrs="{'invisible': ['|', ('sale_order_id', '=', False), ('state', 'not in', ['draft'])]}"
                     />
                 </div>
+                <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
+                    <button type="object"
+                        name="action_view_journal_uangmuka"
+                        class="oe_stat_button"
+                        icon="fa-book"
+                        attrs="{'invisible':[('move_id','=',False)]}"
+                        style="width: 200px;">
+                        <field name="move_id" widget="statinfo" string="Journal Uang Muka"/>
+                        <span class="o_stat_text">
+                            <t t-esc="record.move_id.name"/>
+                        </span>
+                    </button>
+                </xpath>
                 <button id="draft_confirm" position="after">
                     <button name="po_approve"
                             string="Ask Approval"
-- 
cgit v1.2.3


From d3538371691a43efbd5527b746c942bdef9fd1ba Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 7 Jun 2025 11:02:03 +0700
Subject: (andri) Pada PO, CAB tidak tampil jika statusnya bukan posted

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

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 27f1aebd..004a1fa4 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -89,6 +89,14 @@ class PurchaseOrder(models.Model):
     store_name = fields.Char(string='Nama Toko')
     purchase_order_count = fields.Integer('Purchase Order Count', related='partner_id.purchase_order_count')
 
+    is_cab_visible = fields.Boolean(string='Tampilkan Tombol CAB', compute='_compute_is_cab_visible')
+
+    @api.depends('move_id.state')
+    def _compute_is_cab_visible(self):
+        for order in self:
+            move = order.move_id
+            order.is_cab_visible = bool(move and move.state == 'posted')
+
     def action_view_journal_uangmuka(self):
         self.ensure_one()
         if not self.move_id:
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 12ad6864..a78f300c 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -15,11 +15,12 @@
                     />
                 </div>
                 <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
+                    <field name="is_cab_visible" invisible="1"/>
                     <button type="object"
                         name="action_view_journal_uangmuka"
                         class="oe_stat_button"
                         icon="fa-book"
-                        attrs="{'invisible':[('move_id','=',False)]}"
+                        attrs="{'invisible': [('is_cab_visible', '=', False)]}"
                         style="width: 200px;">
                         <field name="move_id" widget="statinfo" string="Journal Uang Muka"/>
                         <span class="o_stat_text">
@@ -78,7 +79,7 @@
                     <field name="total_cost_service" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
                     <field name="total_delivery_amt" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
                     <field name="product_bom_id"/>
-                    <field name="move_id" domain="[('move_type','=','entry')]" context="{'form_view_ref': 'account.view_move_form'}" options="{'no_create': True}"/>
+                    <!-- <field name="move_id" domain="[('move_type','=','entry')]" context="{'form_view_ref': 'account.view_move_form'}" options="{'no_create': True}"/> -->
                 </field>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
-- 
cgit v1.2.3


From 02511349a98e9488ed91795a062774f7d3ad26a6 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 7 Jun 2025 13:41:09 +0700
Subject: (andri) Nomor CAB serta nominal terisi otomatis ketika create reklas

---
 indoteknik_custom/models/invoice_reklas.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/indoteknik_custom/models/invoice_reklas.py b/indoteknik_custom/models/invoice_reklas.py
index d10d4c31..8641ca07 100644
--- a/indoteknik_custom/models/invoice_reklas.py
+++ b/indoteknik_custom/models/invoice_reklas.py
@@ -18,6 +18,17 @@ class InvoiceReklas(models.TransientModel):
         ('pembelian', 'Pembelian'),
     ], string='Reklas Tipe')
 
+    @api.model
+    def default_get(self, fields):
+        res = super().default_get(fields)
+        active_ids = self._context.get('active_ids', [])
+        if active_ids:
+            move = self.env['account.move'].browse(active_ids[0])
+            if move.move_type == 'entry':
+                res['reklas_id'] = move.id
+                res['pay_amt'] = move.amount_total  # atau amount_residual jika mau sisa
+        return res
+
     @api.onchange('reklas_type')
     def _onchange_reklas_type(self):
         if self.reklas_type == 'penjualan':
-- 
cgit v1.2.3


From 49dcd6e8111483cd8f64aa2401a41b3a8d57a1dc Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 7 Jun 2025 13:46:46 +0700
Subject: (andri) onchange Nomor CAB serta nominal terisi otomatis ketika
 create reklas

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

diff --git a/indoteknik_custom/models/invoice_reklas.py b/indoteknik_custom/models/invoice_reklas.py
index 8641ca07..59c78ce6 100644
--- a/indoteknik_custom/models/invoice_reklas.py
+++ b/indoteknik_custom/models/invoice_reklas.py
@@ -18,6 +18,15 @@ class InvoiceReklas(models.TransientModel):
         ('pembelian', 'Pembelian'),
     ], string='Reklas Tipe')
 
+    @api.onchange('reklas_type')
+    def _onchange_reklas_type(self):
+        if self.reklas_type == 'penjualan':
+            invoices = self.env['account.move'].browse(self._context.get('active_ids', []))
+            self.pay_amt = invoices.amount_total
+            # Tambahan ini:
+            if len(invoices) == 1 and invoices.move_type == 'entry':
+                self.reklas_id = invoices.id
+
     @api.model
     def default_get(self, fields):
         res = super().default_get(fields)
-- 
cgit v1.2.3


From 984e128294f4c3d9d3d8eab8dacf03846f8336b2 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 7 Jun 2025 15:53:32 +0700
Subject: (andri) revisi peletakan CAB pada PO dan add field reklas misc

---
 indoteknik_custom/models/account_move.py   | 1 +
 indoteknik_custom/views/account_move.xml   | 6 ++++++
 indoteknik_custom/views/purchase_order.xml | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index 29368089..73dbefd6 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -67,6 +67,7 @@ class AccountMove(models.Model):
     is_hr = fields.Boolean(string="Is HR?", default=False)
     purchase_order_id = fields.Many2one('purchase.order', string='Purchase Order')
     length_of_payment = fields.Integer(string="Length of Payment", compute='compute_length_of_payment')
+    reklas_misc_id = fields.Many2one('account.move', string='No Jurnal Reklas (MISC)')
 
     def name_get(self):
         result = []
diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 9217cc2a..dda7f272 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -6,6 +6,12 @@
             <field name="model">account.move</field>
             <field name="inherit_id" ref="account.view_move_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//div[@name='journal_div']" position="after">
+                    <field name="reklas_misc_id"
+                        string="No Jurnal Reklas (MISC)"
+                        attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"
+                        readonly="1"/>
+                </xpath>
                 <button name="action_register_payment" position="after">
                     <button name="indoteknik_custom.action_view_invoice_reklas" string="Reklas"
                         type="action" class="btn-primary"  attrs="{'invisible': [('state', '!=', 'posted')]}"/>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index a78f300c..9084bcbb 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -14,7 +14,7 @@
                             attrs="{'invisible': ['|', ('sale_order_id', '=', False), ('state', 'not in', ['draft'])]}"
                     />
                 </div>
-                <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
+                <xpath expr="//button[@name='action_view_invoice']" position="before">
                     <field name="is_cab_visible" invisible="1"/>
                     <button type="object"
                         name="action_view_journal_uangmuka"
-- 
cgit v1.2.3


From 9200e74126c99410b79ef2c344915251bef6af19 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 7 Jun 2025 15:55:40 +0700
Subject: (andri) edit penamaan field Reklas

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

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index 73dbefd6..3333af8f 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -67,7 +67,7 @@ class AccountMove(models.Model):
     is_hr = fields.Boolean(string="Is HR?", default=False)
     purchase_order_id = fields.Many2one('purchase.order', string='Purchase Order')
     length_of_payment = fields.Integer(string="Length of Payment", compute='compute_length_of_payment')
-    reklas_misc_id = fields.Many2one('account.move', string='No Jurnal Reklas (MISC)')
+    reklas_misc_id = fields.Many2one('account.move', string='Journal Entries Reklas')
 
     def name_get(self):
         result = []
diff --git a/indoteknik_custom/models/invoice_reklas.py b/indoteknik_custom/models/invoice_reklas.py
index 59c78ce6..5e21a787 100644
--- a/indoteknik_custom/models/invoice_reklas.py
+++ b/indoteknik_custom/models/invoice_reklas.py
@@ -11,7 +11,7 @@ _logger = logging.getLogger(__name__)
 class InvoiceReklas(models.TransientModel):
     _name = 'invoice.reklas'
     _description = "digunakan untuk reklas Uang Muka Penjualan"
-    reklas_id = fields.Many2one('account.move', string='Nomor CAB')
+    reklas_id = fields.Many2one('account.move', string='Nomor CAB', domain="[('move_type','=','entry')]")
     pay_amt = fields.Float(string='Yang dibayarkan')
     reklas_type = fields.Selection([
         ('penjualan', 'Penjualan'),
diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index dda7f272..07efc077 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='journal_div']" position="after">
                     <field name="reklas_misc_id"
-                        string="No Jurnal Reklas (MISC)"
+                        string="Journal Entries Reklas"
                         attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"
                         readonly="1"/>
                 </xpath>
-- 
cgit v1.2.3


From c827294ee6dd613de089af846521cfdc76550e16 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 10 Jun 2025 13:10:35 +0700
Subject: (andri) revisi mengenai onchange create reklas dan yang lain

---
 indoteknik_custom/models/account_move.py           |  3 +
 indoteknik_custom/models/invoice_reklas.py         | 97 ++++++++++++++++------
 .../models/invoice_reklas_penjualan.py             | 60 +++++++++----
 indoteknik_custom/views/account_move.xml           |  1 +
 4 files changed, 118 insertions(+), 43 deletions(-)

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index 3333af8f..4cd2b6b3 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -68,6 +68,9 @@ class AccountMove(models.Model):
     purchase_order_id = fields.Many2one('purchase.order', string='Purchase Order')
     length_of_payment = fields.Integer(string="Length of Payment", compute='compute_length_of_payment')
     reklas_misc_id = fields.Many2one('account.move', string='Journal Entries Reklas')
+    # Di model account.move
+    bill_id = fields.Many2one('account.move', string='Vendor Bill', domain=[('move_type', '=', 'in_invoice')], help='Bill asal dari proses reklas ini')
+
 
     def name_get(self):
         result = []
diff --git a/indoteknik_custom/models/invoice_reklas.py b/indoteknik_custom/models/invoice_reklas.py
index 5e21a787..b7d52371 100644
--- a/indoteknik_custom/models/invoice_reklas.py
+++ b/indoteknik_custom/models/invoice_reklas.py
@@ -20,12 +20,26 @@ class InvoiceReklas(models.TransientModel):
 
     @api.onchange('reklas_type')
     def _onchange_reklas_type(self):
-        if self.reklas_type == 'penjualan':
-            invoices = self.env['account.move'].browse(self._context.get('active_ids', []))
-            self.pay_amt = invoices.amount_total
-            # Tambahan ini:
-            if len(invoices) == 1 and invoices.move_type == 'entry':
-                self.reklas_id = invoices.id
+        active_ids = self._context.get('active_ids', [])
+        if not active_ids:
+            return
+
+        move = self.env['account.move'].browse(active_ids[0])
+        cab = False
+
+        if move.move_type == 'entry':
+            cab = move
+        elif move.move_type == 'in_invoice':
+            if move.reklas_misc_id:
+                cab = move.reklas_misc_id
+            elif move.purchase_order_id and move.purchase_order_id.move_id:
+                cab = move.purchase_order_id.move_id
+
+        if cab:
+            self.reklas_id = cab.id
+
+        # ✅ Selalu ambil nilai dari invoice yang direklas (bukan dari CAB)
+        self.pay_amt = move.amount_total
 
     @api.model
     def default_get(self, fields):
@@ -33,11 +47,23 @@ class InvoiceReklas(models.TransientModel):
         active_ids = self._context.get('active_ids', [])
         if active_ids:
             move = self.env['account.move'].browse(active_ids[0])
+            cab = False
+
             if move.move_type == 'entry':
-                res['reklas_id'] = move.id
-                res['pay_amt'] = move.amount_total  # atau amount_residual jika mau sisa
+                cab = move
+            elif move.move_type == 'in_invoice':
+                if move.reklas_misc_id:
+                    cab = move.reklas_misc_id
+                elif move.purchase_order_id and move.purchase_order_id.move_id:
+                    cab = move.purchase_order_id.move_id
+
+            if cab:
+                res['reklas_id'] = cab.id
+
+            res['pay_amt'] = move.amount_total
         return res
 
+
     @api.onchange('reklas_type')
     def _onchange_reklas_type(self):
         if self.reklas_type == 'penjualan':
@@ -49,33 +75,47 @@ class InvoiceReklas(models.TransientModel):
             raise UserError('Reklas Tipe harus diisi')
         if not self.reklas_id:
             raise UserError('Nomor CAB harus diisi')
+
         invoices = self.env['account.move'].browse(self._context.get('active_ids', []))
         current_time = datetime.now()
+
         for invoice in invoices:
-            if self.reklas_type == 'penjualan':
-                ref_name = 'REKLAS '+self.reklas_id.name+" UANG MUKA PENJUALAN "+invoice.name+" "+invoice.partner_id.name
-            else:
-                ref_name = 'REKLAS '+self.reklas_id.name+" UANG MUKA PEMBELIAN "+invoice.name+" "+invoice.partner_id.name
-            if self.reklas_type == 'penjualan':
-                parameters_header = {
-                    'ref': ref_name,
-                    'date': current_time,
-                    'journal_id': 13
-                }
-            else:
-                parameters_header = {
-                    'ref': ref_name,
-                    'date': current_time,
-                    'journal_id': 13
-                }
+            # Ambil nama PO jika ada
+            po_name = invoice.purchase_order_id.name if invoice.purchase_order_id else ''
+
+            # Susun nama referensi dengan aman
+            ref_name = 'REKLAS {} UANG MUKA {} {}{} {}'.format(
+                self.reklas_id.name or '',
+                'PENJUALAN' if self.reklas_type == 'penjualan' else 'PEMBELIAN',
+                invoice.name or '',
+                f" - {po_name}" if po_name else '',
+                invoice.partner_id.name or ''
+            )
+
+            # Header jurnal reklas
+            parameters_header = {
+                'ref': ref_name,
+                'date': current_time,
+                'journal_id': 13
+            }
 
             account_move = request.env['account.move'].create([parameters_header])
             _logger.info('Success Reklas with %s' % account_move.name)
 
+            # ✅ Set Bill asal sebagai source document
+            account_move.bill_id = invoice.id
+            
+            # Tambahkan info asal invoice ke jurnal (opsional)
+            account_move.invoice_origin = invoice.name
+
+            # Simpan hubungan balik ke invoice
+            invoice.reklas_misc_id = account_move.id
+
+            # Buat line debit dan kredit
             if self.reklas_type == 'penjualan':
                 parameter_debit = {
                     'move_id': account_move.id,
-                    'account_id': 668, # penerimaan belum alokasi
+                    'account_id': 668,  # penerimaan belum alokasi
                     'partner_id': invoice.partner_id.id,
                     'currency_id': 12,
                     'debit': self.pay_amt,
@@ -91,7 +131,7 @@ class InvoiceReklas(models.TransientModel):
                     'credit': self.pay_amt,
                     'name': ref_name
                 }
-            else:
+            else:  # pembelian
                 parameter_debit = {
                     'move_id': account_move.id,
                     'account_id': 438,
@@ -110,7 +150,11 @@ class InvoiceReklas(models.TransientModel):
                     'credit': self.pay_amt,
                     'name': ref_name
                 }
+
+            # Simpan journal lines
             request.env['account.move.line'].create([parameter_debit, parameter_credit])
+
+            # Tampilkan hasil jurnal reklas
             return {
                 'name': _('Journal Entries'),
                 'view_mode': 'form',
@@ -120,4 +164,3 @@ class InvoiceReklas(models.TransientModel):
                 'type': 'ir.actions.act_window',
                 'res_id': account_move.id
             }
-    
\ No newline at end of file
diff --git a/indoteknik_custom/models/invoice_reklas_penjualan.py b/indoteknik_custom/models/invoice_reklas_penjualan.py
index 80c3ed43..2f5ee160 100644
--- a/indoteknik_custom/models/invoice_reklas_penjualan.py
+++ b/indoteknik_custom/models/invoice_reklas_penjualan.py
@@ -17,43 +17,70 @@ class InvoiceReklasPenjualan(models.TransientModel):
 
     def create_reklas_penjualan(self):
         invoices = self.invoice_reklas_line
-
         current_time = datetime.now()
         account_move_ids = []
-        for invoice in invoices:
-            ref_name = 'REKLAS ' + invoice.reklas_id.name + " UANG MUKA PENJUALAN " + invoice.name + " " + invoice.partner_id.name
+
+        for line in invoices:
+            # Ambil nama SO jika ada
+            so_name = line.sale_id.name if line.sale_id else ''
+
+            # Susun referensi nama jurnal
+            ref_name = 'REKLAS {} UANG MUKA PENJUALAN {}{} {}'.format(
+                line.reklas_id.name or '',
+                line.name or '',
+                f" - {so_name}" if so_name else '',
+                line.partner_id.name or ''
+            )
+
+            # Header jurnal
             parameters_header = {
                 'ref': ref_name,
                 'date': current_time,
-                'journal_id': 13
+                'journal_id': 13,
+                # ⬇️ Tambahkan jika tahu invoice asal (name = ID Bill)
+                'bill_id': int(line.name) if line.name and line.name.isdigit() else False,
             }
 
             account_move = self.env['account.move'].create([parameters_header])
             _logger.info('Success Reklas with %s' % account_move.name)
 
-            parameter_debit = {
+            # Simpan info asal (optional)
+            account_move.invoice_origin = line.name
+
+            # Simpan juga ke `reklas_misc_id` jika ditemukan invoice valid
+            if line.name and line.name.isdigit():
+                invoice_id = self.env['account.move'].browse(int(line.name))
+                if invoice_id.exists():
+                    invoice_id.reklas_misc_id = account_move.id
+
+            # Buat debit kredit line
+            debit_line = {
                 'move_id': account_move.id,
-                'account_id': 668,  # uang muka penjualan
-                'partner_id': invoice.partner_id.id,
+                'account_id': 668,  # akun penerimaan belum alokasi
+                'partner_id': line.partner_id.id,
                 'currency_id': 12,
-                'debit': invoice.pay_amt,
+                'debit': line.pay_amt,
                 'credit': 0,
                 'name': ref_name
             }
-            parameter_credit = {
+            credit_line = {
                 'move_id': account_move.id,
-                'account_id': 395,
-                'partner_id': invoice.partner_id.id,
+                'account_id': 395,  # akun pengurang
+                'partner_id': line.partner_id.id,
                 'currency_id': 12,
                 'debit': 0,
-                'credit': invoice.pay_amt,
+                'credit': line.pay_amt,
                 'name': ref_name
             }
-            self.env['account.move.line'].create([parameter_debit, parameter_credit])
+
+            self.env['account.move.line'].create([debit_line, credit_line])
             account_move_ids.append(account_move.id)
-            invoice.unlink()
-            
-        self.unlink()
+
+            line.unlink()  # bersihkan line setelah selesai
+
+        self.unlink()  # hapus wizard utama setelah selesai
+
+        # Tampilkan hasil jurnal reklas
         return {
             'name': _('Journal Entries'),
             'view_mode': 'tree,form',
@@ -63,6 +90,7 @@ class InvoiceReklasPenjualan(models.TransientModel):
             'domain': [('id', 'in', account_move_ids)],
         }
 
+
 class InvoiceReklasPenjualanLine(models.TransientModel):
     _name = 'invoice.reklas.penjualan.line'
     _description = "digunakan untuk reklas Uang Muka Penjualan"
diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 07efc077..3a620a6a 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -38,6 +38,7 @@
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
                     <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/>
+                    <field name="bill_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
                 </field>
                 <field name="partner_shipping_id" position="before">
                     <field name="real_invoice_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
-- 
cgit v1.2.3


From d89f6b21f0174d52b1efb7d54ec3443bbbe3fbcb Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 10 Jun 2025 14:00:00 +0700
Subject: (andri) penyesuaian munculnya field

---
 indoteknik_custom/models/invoice_reklas.py | 15 +++++++++------
 indoteknik_custom/views/account_move.xml   |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/indoteknik_custom/models/invoice_reklas.py b/indoteknik_custom/models/invoice_reklas.py
index b7d52371..5145e098 100644
--- a/indoteknik_custom/models/invoice_reklas.py
+++ b/indoteknik_custom/models/invoice_reklas.py
@@ -27,6 +27,7 @@ class InvoiceReklas(models.TransientModel):
         move = self.env['account.move'].browse(active_ids[0])
         cab = False
 
+        # Deteksi dari mana asal CAB
         if move.move_type == 'entry':
             cab = move
         elif move.move_type == 'in_invoice':
@@ -35,12 +36,14 @@ class InvoiceReklas(models.TransientModel):
             elif move.purchase_order_id and move.purchase_order_id.move_id:
                 cab = move.purchase_order_id.move_id
 
+        # Isi field Nomor CAB jika ditemukan
         if cab:
             self.reklas_id = cab.id
 
-        # ✅ Selalu ambil nilai dari invoice yang direklas (bukan dari CAB)
+        # Nilai yang dibayarkan harus tetap ambil dari invoice/bill
         self.pay_amt = move.amount_total
 
+
     @api.model
     def default_get(self, fields):
         res = super().default_get(fields)
@@ -64,11 +67,11 @@ class InvoiceReklas(models.TransientModel):
         return res
 
 
-    @api.onchange('reklas_type')
-    def _onchange_reklas_type(self):
-        if self.reklas_type == 'penjualan':
-            invoices = self.env['account.move'].browse(self._context.get('active_ids', []))
-            self.pay_amt = invoices.amount_total
+    # @api.onchange('reklas_type')
+    # def _onchange_reklas_type(self):
+    #     if self.reklas_type == 'penjualan':
+    #         invoices = self.env['account.move'].browse(self._context.get('active_ids', []))
+    #         self.pay_amt = invoices.amount_total
 
     def create_reklas(self):
         if not self.reklas_type:
diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 3a620a6a..0c2f9a68 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -37,8 +37,8 @@
                 </field>
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
-                    <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/>
-                    <field name="bill_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
+                    <!-- <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/> -->
+                    <field name="bill_id" readonly="1"  attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('purchase_order_id', '!=', False)]}"/>
                 </field>
                 <field name="partner_shipping_id" position="before">
                     <field name="real_invoice_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
-- 
cgit v1.2.3