<Miqdad> fix ccm

3 files changed, 10 insertions, 9 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 003b1f47..2465fa96 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -202,12 +202,7 @@ class StockPicking(models.Model):
     so_num = fields.Char('SO Number', compute='_get_so_num')
     is_so_fiktif = fields.Boolean('SO Fiktif?', compute='_compute_is_so_fiktif', tracking=3)
     payment_term = fields.Char('Payment Term', compute='_get_partner_payment_term')
-    is_rev_tg = fields.Boolean('Administrasi', compute='_compute_is_rev_tg', store=False)
-
-    @api.depends('tukar_guling_id.rev_tukar_guling')
-    def _compute_is_rev_tg(self):
-        for record in self:
-            record.is_rev_tg = record.tukar_guling_id.rev_tukar_guling if record.tukar_guling_id else False
+    is_rev_tg = fields.Boolean('Administrasi')
 
     @api.depends('sale_id.payment_term_id')
     def _get_partner_payment_term(self):
diff --git a/indoteknik_custom/models/tukar_guling.py b/indoteknik_custom/models/tukar_guling.py
index 577047be..682c478a 100644
--- a/indoteknik_custom/models/tukar_guling.py
+++ b/indoteknik_custom/models/tukar_guling.py
@@ -87,7 +87,7 @@ class TukarGuling(models.Model):
     is_has_invoice = fields.Boolean('Has Invoice?', compute='_compute_is_has_invoice', readonly=True, default=False)
 
     invoice_id = fields.Many2many('account.move', string='Invoice Ref', readonly=True)
-    rev_tukar_guling = fields.Boolean('Administrasi?', default=False, tracking=3)
+    rev_tukar_guling = fields.Boolean('Administrasi?', tracking=3)
 
     @api.depends('origin', 'operations')
     def _compute_origin_so(self):
@@ -811,6 +811,7 @@ class TukarGuling(models.Model):
                     'tukar_guling_id': record.id,
                     'sale_order': record.origin,
                     'note': record.notes,
+                    'is_rev_tg': bool(record.rev_tukar_guling),
                 })
                 created_returns.append(srt_picking)
                 _logger.info(f"✅ SRT created: {srt_picking.name}")
@@ -875,6 +876,7 @@ class TukarGuling(models.Model):
                         'driver_arrival_date': bu_out.driver_arrival_date,
                         'delivery_date': bu_out.delivery_date,
                         'note': record.notes,
+                        'is_rev_tg': bool(record.rev_tukar_guling),
                     })
 
                     created_returns.append(ort_picking)
@@ -921,6 +923,7 @@ class TukarGuling(models.Model):
                         'tukar_guling_id': record.id,
                         'sale_order': record.origin,
                         'note': record.notes,
+                        'is_rev_tg': bool(record.rev_tukar_guling),
                     })
                     new_pick.action_assign()
                     new_pick.action_confirm()
@@ -964,6 +967,7 @@ class TukarGuling(models.Model):
                         'sj_return_date': bu_out.sj_return_date if record.rev_tukar_guling else False,
                         'driver_arrival_date': bu_out.driver_arrival_date if record.rev_tukar_guling else False,
                         'delivery_date': bu_out.delivery_date if record.rev_tukar_guling else False,
+                        'is_rev_tg': bool(record.rev_tukar_guling),
                     })
                     created_returns.append(new_out)
                     _logger.info(f"✅ BU/OUT Baru dari SRT created: {new_out.name}")
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 7748b652..5671c9f0 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -172,6 +172,7 @@
                     <field name="is_bu_iu"/>
                     <field name="is_so_fiktif" readonly="1"/>
                     <field name="is_rev_tg" invisible="1" />
+                    <field name="tukar_guling_id" invisible="1" />
                     <field name="approval_status" attrs="{'invisible': [('is_bu_iu', '=', False)]}"/>
                     <field name="date_doc_kirim" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
                     <field name="summary_qty_operation"/>
@@ -360,11 +361,12 @@
                     <widget name="web_ribbon"
                             title="Administrasi"
                             bg_color="bg-danger"
-                            attrs="{'invisible': [('is_rev_tg', '=', False)]}"/>
+                            attrs="{'invisible': ['|', ('tukar_guling_id','=',False), ('is_rev_tg','=', False)]}"/>
+
                     <widget name="web_ribbon"
                             title="Perlu Dikirim"
                             bg_color="bg-success"
-                            attrs="{'invisible': [('is_rev_tg', '=', True)]}"/>
+                            attrs="{'invisible': ['|', ('tukar_guling_id','=',False), ('is_rev_tg','=', True)]}"/>
                 </xpath>
             </field>
         </record>