From 414b741f6fdd3ba37754db516c695231e3fbca6e Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 25 Jul 2025 09:22:20 +0700
Subject: <hafid> hold refund

---
 indoteknik_custom/views/account_move.xml |  6 +++---
 indoteknik_custom/views/sale_order.xml   | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 9b1c791b..ae944a4a 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -36,9 +36,9 @@
                     <!-- <field name="purchase_order_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"/> -->
                 </field>
                 <field name="ref" position="after">
-                    <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
-                    <!-- <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 name="sale_id" readonly="1" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('has_refund_so', '=', True)]}"/>
+                    <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>
                 <field name="reklas_misc_id" position="after">
                     <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 5bcd7641..1a4726d6 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -35,13 +35,13 @@
                             string="UangMuka"
                             type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
                 </button>
-                <!-- <xpath expr="//header" position="inside">
+                <xpath expr="//header" position="inside">
                     <button name="button_refund"
                         type="object"
                         string="Refund"
                         class="btn-primary"
                         attrs="{'invisible': ['|', ('state', 'not in', ['sale', 'done']), ('has_refund', '=', True)]}" />
-                </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"
@@ -52,13 +52,13 @@
                         <field name="advance_payment_move_count" widget="statinfo" string="Journals"/>
                     </button>
 
-                    <!-- <button type="object"
+                    <button type="object"
                             name="action_view_related_refunds"
                             class="oe_stat_button"
                             icon="fa-refresh"
                             attrs="{'invisible': [('refund_count', '=', 0)]}">
                         <field name="refund_count" widget="statinfo" string="Refund"/>
-                    </button> -->
+                    </button>
                 </div>
                     <field name="payment_term_id" position="after">
                     <field name="create_uid" invisible="1"/>
@@ -176,7 +176,7 @@
                         <field name="expected_ready_to_ship"/>
                         <field name="eta_date_start"/>
                         <field name="eta_date" readonly="1"/>
-                        <!-- <field name="has_refund" readonly="1"/> -->
+                        <field name="has_refund" readonly="1"/>
                     </group>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']"
@@ -658,7 +658,7 @@
         </record>
     </data>
 
-    <!-- <data>
+    <data>
         <record id="sale_order_multi_create_refund_ir_actions_server" model="ir.actions.server">
             <field name="name">Refund</field>
             <field name="model_id" ref="sale.model_sale_order"/>
@@ -666,7 +666,7 @@
             <field name="state">code</field>
             <field name="code">action = records.open_form_multi_create_refund()</field>
         </record>
-    </data> -->
+    </data>
 
     <data>
         <record id="mail_template_sale_order_notification_to_salesperson" model="mail.template">
-- 
cgit v1.2.3


From b4fa8f4df995f946b642eda78ca5fc2b8badada2 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 28 Jul 2025 15:06:26 +0700
Subject: <hafid> fixing journal

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
index 4f791722..0c4eaa56 100644
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -66,7 +66,7 @@
                             string="Journal Refund"
                             type="object"
                             class="oe_highlight"
-                            attrs="{'invisible': ['|', ('status', 'not in', ['pengajuan3','refund']), ('journal_refund_state', '=', 'posted')]}"/>
+                            attrs="{'invisible': [('journal_refund_state', '=', 'posted')]}"/>
 
                     <field name="status"
                         widget="statusbar"
@@ -117,8 +117,8 @@
                             <field name="note_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                         </group>
                         <group>
-                            <field name="uang_masuk" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="total_invoice" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                            <field name="uang_masuk" attrs="{'readonly': ['|', ('is_locked', '=', True), ('refund_type', '=', 'barang_kosong_sebagian')]}"/>
+                            <field name="total_invoice" readonly="1"/>
                             <field name="ongkir" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="amount_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="amount_refund_text" readonly="1"/>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 987303ba..08dcfbb7 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -40,7 +40,7 @@
                         type="object"
                         string="Refund"
                         class="btn-primary"
-                        attrs="{'invisible': ['|', ('state', 'not in', ['sale', 'done']), ('has_refund', '=', True)]}" />
+                        attrs="{'invisible': [('has_refund', '=', 'True')]}" />
                 </xpath>
                 <div class="oe_button_box" name="button_box">
                     <field name="advance_payment_move_ids" invisible="1"/>
-- 
cgit v1.2.3


From 747075fb85372666b89d5ffd07a43664ecf169e1 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 4 Aug 2025 14:41:27 +0700
Subject: <hafid> Fix problem

---
 indoteknik_custom/views/ir_sequence.xml       |  2 +-
 indoteknik_custom/views/refund_sale_order.xml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 4915e4c5..94c2cd07 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -220,7 +220,7 @@
         </record>
 
         <record id="seq_refund_sale_order" model="ir.sequence">
-            <field name="name">Refund Sale Order</field>
+            <field name="name">Refund Sales Order</field>
             <field name="code">refund.sale.order</field>
             <field name="prefix">RC/%(year)s/%(month)s/</field>
             <field name="padding">4</field>
diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
index e35e76b3..27c5feec 100644
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -56,7 +56,7 @@
                     <button name="action_trigger_cancel"
                             type="object"
                             string="Cancel"
-                            attrs="{'invisible': ['|', ('status_payment', '!=', 'pending'), ('status', '=', 'reject')]}" />
+                            attrs="{'invisible': ['|', ('status_payment', '!=', 'pending'), ('status', 'in', ['reject', 'refund'])]}" />
                     <button name="action_confirm_refund"
                             type="object"
                             string="Confirm Payment"
@@ -66,7 +66,7 @@
                             string="AP Only"
                             type="object"
                             class="oe_highlight"
-                            attrs="{'invisible': ['|', ('journal_refund_state', '=', 'posted'), ('status', 'not in', ['pengajuan3','refund'])]}"/>
+                            attrs="{'invisible': ['|', ('journal_refund_state', 'in', ['posted', 'draft']), ('status', 'not in', ['pengajuan3','refund'])]}"/>
 
                     <field name="status"
                         widget="statusbar"
@@ -85,7 +85,7 @@
                                 class="oe_stat_button"
                                 icon="fa-book"
                                 width="250px"
-                                attrs="{'invisible': ['|', ('journal_refund_move_id', '=', False), ('journal_refund_state', '!=', 'posted')]}">
+                                attrs="{'invisible': [('journal_refund_move_id', '=', False)]}">
                             <field name="journal_refund_move_id" string="Journal Refund" widget="statinfo"/>
                         </button>
                     </div>
@@ -163,8 +163,8 @@
                                 </group>
                                 <group>
                                     <field name="bukti_refund_type"  reqiured="1" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                                    <field name="bukti_transfer_refund_pdf"  widget="pdf_viewer" attrs="{'invisible': [('bukti_refund_type', '=', 'image')]}"/>
-                                    <field name="bukti_transfer_refund_image"  widget="image" attrs="{'invisible': [('bukti_refund_type', '=', 'pdf')]}"/>
+                                    <field name="bukti_transfer_refund_pdf"  widget="pdf_viewer" attrs="{'invisible': [('bukti_refund_type', '=', 'image')], 'readonly': [('is_locked', '=', True)]}"/>
+                                    <field name="bukti_transfer_refund_image"  widget="image" attrs="{'invisible': [('bukti_refund_type', '=', 'pdf')], 'readonly': [('is_locked', '=', True)]}"/>
                                 </group>
                             </group>
                         </page>
-- 
cgit v1.2.3


From bbc454fd6e13d12e9674769a555264f2c2343b5b Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 20 Aug 2025 09:06:33 +0700
Subject: <hafid> refund system sisa uang muka

---
 indoteknik_custom/views/refund_sale_order.xml | 40 +++++++++++++++++++++++++--
 indoteknik_custom/views/sale_order.xml        |  4 +--
 2 files changed, 39 insertions(+), 5 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
index 27c5feec..dd47c2ab 100644
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -14,6 +14,7 @@
                 <field name="ongkir" readonly="1"/>
                 <field name="total_invoice" readonly="1"/>
                 <field name="amount_refund" readonly="1"/>
+                <field name="remaining_refundable" readonly="1" optional="hide"/>
                 <field name="status"
                     decoration-info="status == 'draft'" 
                     decoration-danger="status == 'reject'" 
@@ -117,11 +118,13 @@
                             <field name="note_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                         </group>
                         <group>
-                            <field name="uang_masuk" attrs="{'readonly': ['|', ('is_locked', '=', True), ('refund_type', '=', 'barang_kosong_sebagian')]}"/>
+                            <field name="uang_masuk" readonly="1"/>
                             <field name="total_invoice" readonly="1"/>
                             <field name="ongkir" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="amount_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="amount_refund_text" readonly="1"/>
+                            <field name="sale_order_count" invisible="1"/>
+                            <field name="remaining_refundable" readonly="1" attrs="{'invisible': [('sale_order_count', '>', 1)]}"/>
                             <field name="uang_masuk_type" required="1" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="bukti_uang_masuk_image" widget="image" 
                                 attrs="{'invisible': [('uang_masuk_type', '=', 'pdf')], 'readonly': [('is_locked', '=', True)]}"/>
@@ -133,7 +136,8 @@
                     <notebook>
                         <page string="Produk Line">
                             <field name="line_ids" attrs="{'readonly': [('is_locked', '=', True)]}">
-                                <tree editable="bottom">
+                                <tree editable="bottom" create="0" delete="1">
+                                    <field name="product_from"/>
                                     <field name="product_id"/>
                                     <field name="quantity"/>
                                     <field name="reason"/>
@@ -168,6 +172,38 @@
                                 </group>
                             </group>
                         </page>
+                        <page string="Sales Order Lines">
+                            <field name="so_order_line_ids" nolabel="1" readonly="1">
+                                <tree>
+                                    <field name="order_id"/>
+                                    <field name="product_id"/>
+                                    <field name="purchase_price"/>
+                                    <field name="product_uom_qty"/>
+                                    <field name="price_unit"/>
+                                    <field name="tax_id" widget="many2many_tags"/>
+                                    <field name="discount"/>
+                                    <field name="price_subtotal"/>
+                                    <field name="item_percent_margin"/>
+                                    <field name="item_percent_margin_before"/>
+                                </tree>
+                            </field>
+                            <group class="oe_subtotal_footer oe_right" colspan="2" name="refund_total">
+                                <field name="amount_untaxed" widget="monetary" options="{'currency_field': 'currency_id'}" readonly="1"/>
+                                <field name="amount_tax" widget="monetary" options="{'currency_field': 'currency_id'}" readonly="1"/>
+                                <div class="oe_subtotal_footer_separator oe_inline o_td_label">
+                                    <label for="amount_total"/>
+                                </div>
+                                <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"
+                                    widget="monetary" options="{'currency_field': 'currency_id'}" readonly="1"/>
+                                <field name="delivery_amt" widget="monetary" options="{'currency_field': 'currency_id'}" readonly="1"/>
+                                <div class="oe_subtotal_footer_separator oe_inline o_td_label">
+                                    <label for="grand_total"/>
+                                </div>
+                                <field name="grand_total" nolabel="1" class="oe_subtotal_footer_separator"
+                                    widget="monetary" options="{'currency_field': 'currency_id'}" readonly="1"/>
+                                <field name="total_margin" widget="monetary" options="{'currency_field': 'currency_id'}" readonly="1"/>
+                            </group>
+                        </page>
 
                         <page string="Cancel Reason" attrs="{'invisible': [('status', '=', 'refund')]}">
                             <group>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 1d51fd69..8f8e4288 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -39,8 +39,7 @@
                     <button name="button_refund"
                         type="object"
                         string="Refund"
-                        class="btn-primary"
-                        attrs="{'invisible': [('has_refund', '=', 'True')]}" />
+                        class="btn-primary" />
                 </xpath>
                 <div class="oe_button_box" name="button_box">
                     <field name="advance_payment_move_ids" invisible="1"/>
@@ -177,7 +176,6 @@
                         <field name="expected_ready_to_ship"/>
                         <field name="eta_date_start"/>
                         <field name="eta_date" readonly="1"/>
-                        <field name="has_refund" readonly="1"/>
                     </group>
                     <group string="Return Doc">
                         <field name="ccm_id" readonly="1"/>
-- 
cgit v1.2.3


From a70798e97805e6c0befb6835abf6637dbac1dd8c Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 22 Aug 2025 11:08:08 +0700
Subject: <hafid> ngambil bu out untuk retur

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
index dd47c2ab..3c60cc57 100644
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -79,6 +79,13 @@
                         statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,refund"
                         attrs="{'invisible': [('status', '=', 'reject')]}" />
                 </header>
+                <xpath expr="//sheet" position="inside">
+                    <field name="show_return_alert" invisible="1"/>
+                    <div class="alert alert-info" role="alert"
+                        attrs="{'invisible': [('show_return_alert', '=', False)]}">
+                        ⚠️ SO belum melakukan retur barang. Silakan buat pengajuan retur.
+                    </div>
+                </xpath>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
                         <button name="action_open_journal_refund"
@@ -118,7 +125,7 @@
                             <field name="note_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                         </group>
                         <group>
-                            <field name="uang_masuk" readonly="1"/>
+                            <field name="uang_masuk" attrs="{'readonly': [('refund_type', '!=', 'salah_transfer')]}"/>
                             <field name="total_invoice" readonly="1"/>
                             <field name="ongkir" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="amount_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-- 
cgit v1.2.3


From 8fb3427f625867b7d47b7ed0d40f994fa52c00e6 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 25 Aug 2025 18:12:25 +0700
Subject: <hafid> integrate tukar guling

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
index 3c60cc57..a2538f42 100644
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -68,6 +68,11 @@
                             type="object"
                             class="oe_highlight"
                             attrs="{'invisible': ['|', ('journal_refund_state', 'in', ['posted', 'draft']), ('status', 'not in', ['pengajuan3','refund'])]}"/>
+                    <button name="action_create_tukar_guling"
+                            string="Create Return"
+                            type="object"
+                            class="oe_highlight"
+                            attrs="{'invisible': [('refund_type', 'not in', ['retur_half', 'retur'])]}"/>
 
                     <field name="status"
                         widget="statusbar"
@@ -81,7 +86,7 @@
                 </header>
                 <xpath expr="//sheet" position="inside">
                     <field name="show_return_alert" invisible="1"/>
-                    <div class="alert alert-info" role="alert"
+                    <div class="alert alert-danger" role="alert"
                         attrs="{'invisible': [('show_return_alert', '=', False)]}">
                         ⚠️ SO belum melakukan retur barang. Silakan buat pengajuan retur.
                     </div>
@@ -96,6 +101,13 @@
                                 attrs="{'invisible': [('journal_refund_move_id', '=', False)]}">
                             <field name="journal_refund_move_id" string="Journal Refund" widget="statinfo"/>
                         </button>
+                        <button name="action_open_tukar_guling"
+                                type="object"
+                                class="oe_stat_button"
+                                icon="fa-refresh"
+                                attrs="{'invisible': ['|', ('refund_type', 'not in', ['retur', 'retur_half']), ('tukar_guling_count', '=', 0)]}">
+                            <field name="tukar_guling_count" string="Pengajuan Return SO" widget="statinfo"/>
+                        </button>
                     </div>
                     <widget name="web_ribbon"
                             title="PAID"
@@ -131,6 +143,7 @@
                             <field name="amount_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="amount_refund_text" readonly="1"/>
                             <field name="sale_order_count" invisible="1"/>
+                            <field name="tukar_guling_ids" invisible="1"/>
                             <field name="remaining_refundable" readonly="1" attrs="{'invisible': [('sale_order_count', '>', 1)]}"/>
                             <field name="uang_masuk_type" required="1" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="bukti_uang_masuk_image" widget="image" 
@@ -144,7 +157,7 @@
                         <page string="Produk Line">
                             <field name="line_ids" attrs="{'readonly': [('is_locked', '=', True)]}">
                                 <tree editable="bottom" create="0" delete="1">
-                                    <field name="product_from"/>
+                                    <field name="ref_id"/>
                                     <field name="product_id"/>
                                     <field name="quantity"/>
                                     <field name="reason"/>
-- 
cgit v1.2.3


From 3139c592dd1f74b7c6a6c4917419628895296406 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Fri, 29 Aug 2025 14:23:18 +0700
Subject: <hafid> refund abis testing aman

---
 indoteknik_custom/views/refund_sale_order.xml | 76 +++++++++++++++++++++++----
 1 file changed, 65 insertions(+), 11 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
index a2538f42..ae0861e2 100644
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -90,6 +90,11 @@
                         attrs="{'invisible': [('show_return_alert', '=', False)]}">
                         ⚠️ SO belum melakukan retur barang. Silakan buat pengajuan retur.
                     </div>
+                    <field name="show_approval_alert" invisible="1"/>
+                    <div class="alert alert-info" role="alert"
+                        attrs="{'invisible': ['|', ('show_approval_alert', '=', False), ('status', 'in', ['reject', 'refund'])]}">
+                        ⚠️ SO sudah melakukan retur barang. Silakan lanjutkan refund.
+                    </div>
                 </xpath>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
@@ -101,12 +106,24 @@
                                 attrs="{'invisible': [('journal_refund_move_id', '=', False)]}">
                             <field name="journal_refund_move_id" string="Journal Refund" widget="statinfo"/>
                         </button>
-                        <button name="action_open_tukar_guling"
+
+                       <button name="action_open_tukar_guling"
                                 type="object"
                                 class="oe_stat_button"
                                 icon="fa-refresh"
-                                attrs="{'invisible': ['|', ('refund_type', 'not in', ['retur', 'retur_half']), ('tukar_guling_count', '=', 0)]}">
-                            <field name="tukar_guling_count" string="Pengajuan Return SO" widget="statinfo"/>
+                                attrs="{'invisible': ['|', ('tukar_guling_count','=', 0), ('has_picking','=',True)]}">
+                            <div class="o_stat_info">
+                                <field name="tukar_guling_count" widget="statinfo"/>
+                                <span class="o_stat_text">Pengajuan Return SO</span>
+                            </div>
+                        </button>
+
+                        <button name="action_view_picking"
+                                type="object"
+                                class="oe_stat_button"
+                                icon="fa-truck"
+                                attrs="{'invisible': [('has_picking','=',False)]}">
+                            <field name="picking_ids" widget="statinfo" string="Delivery"/>
                         </button>
                     </div>
                     <widget name="web_ribbon"
@@ -128,21 +145,26 @@
                             <field name="journal_refund_state" invisible="1"/>
                             
                             <field name="partner_id" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="sale_order_ids" widget="many2many_tags" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="invoice_ids" widget="many2many_tags" readonly="1"/>
-                            <field name="invoice_names" widget="html" readonly="1"/>
-                            <field name="so_names" widget="html" readonly="1"/>
-                            <field name="advance_move_names" widget="html" readonly="1"/>
+                            <field name="sale_order_ids" widget="many2many_tags" attrs="{'readonly': [('is_locked', '=', True)], 'invisible': [('refund_type', '=', 'salah_transfer')]}"/>
+                            <field name="invoice_ids" widget="many2many_tags" readonly="1" attrs="{'invisible': [('refund_type', '=', 'salah_transfer')]}"/>
+                            <field name="tukar_guling_count" invisible="1"/>
+                            <field name="invoice_names" widget="html" readonly="1" attrs="{'invisible': [('refund_type', '=', 'salah_transfer')]}"/>
+                            <field name="so_names" widget="html" readonly="1" attrs="{'invisible': [('refund_type', '=', 'salah_transfer')]}"/>
+                            <field name="advance_move_names" widget="html" readonly="1" attrs="{'invisible': [('refund_type', '=', 'salah_transfer')]}"/>
+                            <field name="transfer_move_id"
+                                    attrs="{'invisible': [('refund_type', '!=', 'salah_transfer')], 
+                                            'required': [('refund_type', '=', 'salah_transfer')]}"/>
                             <field name="refund_type" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="note_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                         </group>
                         <group>
                             <field name="uang_masuk" attrs="{'readonly': [('refund_type', '!=', 'salah_transfer')]}"/>
-                            <field name="total_invoice" readonly="1"/>
-                            <field name="ongkir" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                            <field name="total_invoice" readonly="1" attrs="{'invisible': [('refund_type', '=', 'salah_transfer')]}"/>
+                            <field name="ongkir" attrs="{'readonly': [('is_locked', '=', True)], 'invisible': [('refund_type', '=', 'salah_transfer')]}"/>
                             <field name="amount_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="amount_refund_text" readonly="1"/>
                             <field name="sale_order_count" invisible="1"/>
+                            <field name="has_picking" invisible="1"/>
                             <field name="tukar_guling_ids" invisible="1"/>
                             <field name="remaining_refundable" readonly="1" attrs="{'invisible': [('sale_order_count', '>', 1)]}"/>
                             <field name="uang_masuk_type" required="1" attrs="{'readonly': [('is_locked', '=', True)]}"/>
@@ -157,9 +179,17 @@
                         <page string="Produk Line">
                             <field name="line_ids" attrs="{'readonly': [('is_locked', '=', True)]}">
                                 <tree editable="bottom" create="0" delete="1">
-                                    <field name="ref_id"/>
+                                    <field name="from_name"/>
+                                    <field name="prod_id" invisible="1"/>
+                                    <field name="ref_id" invisible="1"/>
                                     <field name="product_id"/>
                                     <field name="quantity"/>
+                                    <field name="price_unit"/>
+                                    <field name="discount"/>
+                                    <field name="subtotal"/>
+                                    <field name="tax" widget="many2many_tags"/>
+                                    <field name="tax_amt" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                    <field name="total" widget="monetary" options="{'currency_field': 'currency_id'}" sum="Grand Total"/>
                                     <field name="reason"/>
                                 </tree>
                             </field>
@@ -176,6 +206,7 @@
                                     <field name="bank" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                                     <field name="account_name" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                                     <field name="account_no" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                                    <field name="kcp" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                                 </group>
                             </group>
                         </page>
@@ -230,11 +261,34 @@
                                 <field name="reason_reject"/>
                             </group>
                         </page>
+
+                        <page string="Return Line" attrs="{'invisible': ['|', ('tukar_guling_count','=', 0), ('has_picking', '=', False)]}">
+                            <group>
+                                <field name="tukar_guling_ids" readonly="1" nolabel="1">
+                                    <tree>
+                                        <field name="name"/>
+                                        <field name="partner_id" string="Customer"/>
+                                        <field name="origin" string="SO Number"/>
+                                        <field name="operations" string="Operations"/>
+                                        <field name="return_type" string="Return Type"/>
+                                        <field name="state" widget="badge"
+                                            decoration-info="state in ('draft', 'approval_sales', 'approval_finance','approval_logistic')"
+                                            decoration-warning="state == 'approved'"
+                                            decoration-success="state == 'done'"
+                                            decoration-muted="state == 'cancel'"
+                                        />
+                                        <field name="ba_num" string="Nomor BA"/>
+                                        <field name="date"/>
+                                    </tree>
+                                </field>
+                            </group>
+                        </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>
                     <field name="message_ids" widget="mail_thread"/>
+                    <field name="activity_ids" widget="mail_activity"/>
                 </div>
             </form>
         </field>
-- 
cgit v1.2.3


From d7a5e47f741211e9750c21ac148331d6e29bdc16 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Mon, 1 Sep 2025 10:00:32 +0700
Subject: (andri) add sum grand total tree dunning run

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index 210f7917..f624c42e 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -13,7 +13,7 @@
                 <field name="resi_tukar_faktur"/>
                 <field name="date_terima_tukar_faktur"/>
                 <field name="shipper_faktur_id"/>
-                <field name="grand_total"/>
+                <field name="grand_total" sum="Grand Total"/>
                 <field name="create_uid" optional="hide"/>
             </tree>
         </field>
-- 
cgit v1.2.3


From 18df26a9a413261a63cf0531078b51f92f0594fc Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 4 Sep 2025 09:41:21 +0700
Subject: <hafid> fix finance note open lock

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
index ae0861e2..20a07aa3 100644
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -214,12 +214,12 @@
                         <page string="Finance Note">
                             <group col="2">
                                 <group>
-                                    <field name="finance_note" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                                    <field name="finance_note"/>
                                 </group>
                                 <group>
-                                    <field name="bukti_refund_type"  reqiured="1" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                                    <field name="bukti_transfer_refund_pdf"  widget="pdf_viewer" attrs="{'invisible': [('bukti_refund_type', '=', 'image')], 'readonly': [('is_locked', '=', True)]}"/>
-                                    <field name="bukti_transfer_refund_image"  widget="image" attrs="{'invisible': [('bukti_refund_type', '=', 'pdf')], 'readonly': [('is_locked', '=', True)]}"/>
+                                    <field name="bukti_refund_type"  reqiured="1"/>
+                                    <field name="bukti_transfer_refund_pdf"  widget="pdf_viewer" attrs="{'invisible': [('bukti_refund_type', '=', 'image')]"/>
+                                    <field name="bukti_transfer_refund_image"  widget="image" attrs="{'invisible': [('bukti_refund_type', '=', 'pdf')]"/>
                                 </group>
                             </group>
                         </page>
-- 
cgit v1.2.3


From 31a7f35e3c179b7f7ed3dcf764c7e834af559283 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 4 Sep 2025 11:21:39 +0700
Subject: <hafid> fix finance note open lock

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
index 20a07aa3..0c6cd371 100644
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -218,8 +218,8 @@
                                 </group>
                                 <group>
                                     <field name="bukti_refund_type"  reqiured="1"/>
-                                    <field name="bukti_transfer_refund_pdf"  widget="pdf_viewer" attrs="{'invisible': [('bukti_refund_type', '=', 'image')]"/>
-                                    <field name="bukti_transfer_refund_image"  widget="image" attrs="{'invisible': [('bukti_refund_type', '=', 'pdf')]"/>
+                                    <field name="bukti_transfer_refund_pdf"  widget="pdf_viewer" attrs="{'invisible': [('bukti_refund_type', '=', 'image')]}"/>
+                                    <field name="bukti_transfer_refund_image"  widget="image" attrs="{'invisible': [('bukti_refund_type', '=', 'pdf')]}"/>
                                 </group>
                             </group>
                         </page>
-- 
cgit v1.2.3


From 0a1f22cac507ee7e9975f1a68f79bccdf179c9fd Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 5 Sep 2025 09:07:23 +0700
Subject: <miqdad> add image

---
 indoteknik_custom/views/stock_picking.xml | 100 ++++++++++++++++++------------
 1 file changed, 62 insertions(+), 38 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index b3f0ce9f..e230bccc 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <tree position="attributes">
                     <attribute name="default_order">final_seq asc</attribute>
-                   <!-- <attribute name="default_order">create_date desc</attribute> -->
+                    <!-- <attribute name="default_order">create_date desc</attribute> -->
                 </tree>
                 <field name="json_popover" position="after">
                     <field name="date_done" optional="hide"/>
@@ -20,9 +20,11 @@
                     <field name="sj_return_date" optional="hide"/>
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
-                    <field name="state_packing" widget="badge" decoration-success="state_packing == 'packing_done'" decoration-danger="state_packing == 'not_packing'" optional="hide"/>
+                    <field name="state_packing" widget="badge" decoration-success="state_packing == 'packing_done'"
+                           decoration-danger="state_packing == 'not_packing'" optional="hide"/>
                     <field name="final_seq"/>
-                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" optional="hide"/>
+                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'"
+                           decoration-warning="state_approve_md == 'pending'" optional="hide"/>
                     <!-- <field name="countdown_hours" optional="hide"/>
                     <field name="countdown_ready_to_ship" /> -->
                 </field>
@@ -50,11 +52,11 @@
                             type="object"
                             attrs="{'invisible': ['|', ('state', 'in', ['done']), ('approval_receipt_status', '=', 'pengajuan1')]}"
                     />
-<!--                    <button name="ask_return_approval"-->
-<!--                            string="Ask Return/Acc"-->
-<!--                            type="object"-->
-<!--                            attrs="{'invisible': [('state', 'in', ['draft', 'cancel', 'assigned'])]}"-->
-<!--                    />-->
+                    <!--                    <button name="ask_return_approval"-->
+                    <!--                            string="Ask Return/Acc"-->
+                    <!--                            type="object"-->
+                    <!--                            attrs="{'invisible': [('state', 'in', ['draft', 'cancel', 'assigned'])]}"-->
+                    <!--                    />-->
                     <button name="action_create_invoice_from_mr"
                             string="Create Bill"
                             type="object"
@@ -64,12 +66,12 @@
                             string="Biteship"
                             type="object"
                     />
-                     <!-- <button name="action_sync_biteship_tracking"
-                        type="object"
-                        string="Lacak dari Biteship"
-                        class="btn-primary"
-                        attrs="{'invisible': [('biteship_id', '=', False)]}"
-                    /> -->
+                    <!-- <button name="action_sync_biteship_tracking"
+                       type="object"
+                       string="Lacak dari Biteship"
+                       class="btn-primary"
+                       attrs="{'invisible': [('biteship_id', '=', False)]}"
+                   /> -->
                     <button name="track_envio_shipment"
                             string="Tracking Envio"
                             type="object"
@@ -97,6 +99,11 @@
                             attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"
                     />
                 </button>
+                <xpath expr="//field[@name='move_ids_without_package']//tree//field[@name='product_id']"
+                       position="after">
+                    <field name="product_image_128" widget="image"
+                           style="height:128px;width:128px;" readonly="1"/>
+                </xpath>
                 <field name="backorder_id" position="after">
                     <field name="select_shipping_option_so"/>
                     <field name="shipping_method_so_id"/>
@@ -105,7 +112,8 @@
                     <field name="count_line_detail"/>
                     <field name="dokumen_tanda_terima"/>
                     <field name="dokumen_pengiriman"/>
-                    <field name="quantity_koli" attrs="{'invisible': [('location_dest_id', '!=', 60)], 'required': [('location_dest_id', '=', 60)]}"/>
+                    <field name="quantity_koli"
+                           attrs="{'invisible': [('location_dest_id', '!=', 60)], 'required': [('location_dest_id', '=', 60)]}"/>
                     <field name="total_mapping_koli" attrs="{'invisible': [('location_id', '!=', 60)]}"/>
                     <field name="total_koli_display" readonly="1" attrs="{'invisible': [('location_id', '!=', 60)]}"/>
                     <field name="linked_out_picking_id" readonly="1" attrs="{'invisible': [('location_id', '=', 60)]}"/>
@@ -133,7 +141,7 @@
                     <attribute name="readonly">1</attribute>
                 </field>
                 <field name="origin" position="after">
-<!--                    <field name="show_state_approve_md" invisible="1" optional="hide"/>-->
+                    <!--                    <field name="show_state_approve_md" invisible="1" optional="hide"/>-->
                     <field name="state_approve_md" widget="badge"/>
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
@@ -141,7 +149,8 @@
                     <field name="date_doc_kirim" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
                     <field name="summary_qty_operation"/>
                     <field name="count_line_operation"/>
-                    <field name="linked_manual_bu_out" attrs="{'invisible': [('location_id', '=', 60)]}" domain="[('picking_type_code', '=', 'outgoing'),('state', 'not in', ['done','cancel']), ('group_id', '=', group_id)]"/>
+                    <field name="linked_manual_bu_out" attrs="{'invisible': [('location_id', '=', 60)]}"
+                           domain="[('picking_type_code', '=', 'outgoing'),('state', 'not in', ['done','cancel']), ('group_id', '=', group_id)]"/>
                     <field name="account_id"
                            attrs="{
                            'readonly': [['state', 'in', ['done', 'cancel']]],
@@ -189,29 +198,35 @@
                             </group>
                         </group>
                     </page>
-                    <page string="Delivery" name="delivery_order" attrs="{'invisible': [('location_dest_id', '=', 60)]}">
+                    <page string="Delivery" name="delivery_order"
+                          attrs="{'invisible': [('location_dest_id', '=', 60)]}">
                         <group>
                             <group>
                                 <field name="notee"/>
                                 <field name="note_logistic"/>
                                 <field name="note_info"/>
-                                <field name="responsible" />
-                                <field name="carrier_id" attrs="{'invisible': [('select_shipping_option_so', '=', 'biteship')]}" />
+                                <field name="responsible"/>
+                                <field name="carrier_id"
+                                       attrs="{'invisible': [('select_shipping_option_so', '=', 'biteship')]}"/>
                                 <field name="biteship_id" invisible="1"/>
                                 <field name="out_code" attrs="{'invisible': [['out_code', '=', False]]}"/>
                                 <field name="picking_code" attrs="{'invisible': [['picking_code', '=', False]]}"/>
-                                <field name="picking_code" string="Picking code (akan digenerate ketika sudah di-validate)" attrs="{'invisible': [['picking_code', '!=', False]]}"/>
-                                <field name="driver_departure_date" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
+                                <field name="picking_code"
+                                       string="Picking code (akan digenerate ketika sudah di-validate)"
+                                       attrs="{'invisible': [['picking_code', '!=', False]]}"/>
+                                <field name="driver_departure_date"
+                                       attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
                                 <field name="driver_arrival_date"/>
-                                <field name="delivery_tracking_no" attrs="{'invisible': [('select_shipping_option_so', '=', 'biteship')]}"/>
+                                <field name="delivery_tracking_no"
+                                       attrs="{'invisible': [('select_shipping_option_so', '=', 'biteship')]}"/>
                                 <field name="driver_id"/>
                                 <field name='sj_return_date'/>
-                                <field name="sj_documentation" widget="image" />
-                                <field name="paket_documentation" widget="image" />
+                                <field name="sj_documentation" widget="image"/>
+                                <field name="paket_documentation" widget="image"/>
                             </group>
                             <!-- Biteship Group -->
                             <group attrs="{'invisible': [('select_shipping_option_so', '!=', 'biteship')]}">
-                                <field name="delivery_tracking_no" />
+                                <field name="delivery_tracking_no"/>
                                 <field name="shipping_method_so_id"/>
                                 <field name="shipping_option_so_id"/>
                                 <field name="biteship_shipping_price" readonly="1"/>
@@ -220,7 +235,8 @@
                                 <field name="biteship_driver_name" readonly="1"/>
                                 <field name="biteship_driver_phone" readonly="1"/>
                                 <field name="biteship_driver_plate_number" readonly="1"/>
-                                <button name="action_open_biteship_tracking" string="Visit Biteship Tracking" type="object"/>
+                                <button name="action_open_biteship_tracking" string="Visit Biteship Tracking"
+                                        type="object"/>
                             </group>
 
                             <group attrs="{'invisible': [('carrier_id', '!=', 151)]}">
@@ -261,23 +277,27 @@
                             </group>
                         </group>
                     </page>
-                    <page string="Check Product" name="check_product" attrs="{'invisible': [('picking_type_code', '=', 'outgoing')]}">
+                    <page string="Check Product" name="check_product"
+                          attrs="{'invisible': [('picking_type_code', '=', 'outgoing')]}">
                         <field name="check_product_lines"/>
                     </page>
-                    <page string="Barcode Product" name="barcode_product" attrs="{'invisible': [('picking_type_code', '!=', 'incoming')]}">
+                    <page string="Barcode Product" name="barcode_product"
+                          attrs="{'invisible': [('picking_type_code', '!=', 'incoming')]}">
                         <field name="barcode_product_lines"/>
                     </page>
                     <page string="Check Koli" name="check_koli" attrs="{'invisible': [('location_dest_id', '!=', 60)]}">
                         <field name="check_koli_lines"/>
                     </page>
-                    <page string="Mapping Koli" name="konfirm_koli" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}">
+                    <page string="Mapping Koli" name="konfirm_koli"
+                          attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}">
                         <field name="konfirm_koli_lines"/>
                     </page>
-                    <page string="Konfirm Koli" name="scan_koli" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}">
+                    <page string="Konfirm Koli" name="scan_koli"
+                          attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}">
                         <field name="scan_koli_lines"/>
                     </page>
                 </page>
-                
+
             </field>
         </record>
 
@@ -287,18 +307,20 @@
             <field name="arch" type="xml">
                 <tree editable="bottom">
                     <field name="code_koli"/>
-                    <field name="koli_id" options="{'no_create': True}"  domain="[('state', '=', 'not_delivered')]"/>
+                    <field name="koli_id" options="{'no_create': True}" domain="[('state', '=', 'not_delivered')]"/>
                     <field name="scan_koli_progress"/>
                 </tree>
             </field>
         </record>
 
+
         <record id="konfirm_koli_tree" model="ir.ui.view">
             <field name="name">konfirm.koli.tree</field>
             <field name="model">konfirm.koli</field>
             <field name="arch" type="xml">
                 <tree editable="bottom">
-                    <field name="pick_id" options="{'no_create': True}" required="1"  domain="[('picking_type_code', '=', 'internal'), ('group_id', '=', parent.group_id), ('linked_manual_bu_out', '=', parent.id)]"/>
+                    <field name="pick_id" options="{'no_create': True}" required="1"
+                           domain="[('picking_type_code', '=', 'internal'), ('group_id', '=', parent.group_id), ('linked_manual_bu_out', '=', parent.id)]"/>
                 </tree>
             </field>
         </record>
@@ -307,7 +329,7 @@
             <field name="name">check.koli.tree</field>
             <field name="model">check.koli</field>
             <field name="arch" type="xml">
-                <tree editable="bottom">    
+                <tree editable="bottom">
                     <field name="koli"/>
                     <field name="reserved_id"/>
                     <field name="check_koli_progress"/>
@@ -344,12 +366,14 @@
             <field name="model">stock.move.line</field>
             <field name="inherit_id" ref="stock.view_stock_move_line_detailed_operation_tree"/>
             <field name="arch" type="xml">
-                <tree editable="bottom" decoration-muted="(state == 'done' and is_locked == True)" decoration-danger="qty_done&gt;product_uom_qty and state!='done' and parent.picking_type_code != 'incoming'" decoration-success="qty_done==product_uom_qty and state!='done' and not result_package_id">
+                <tree editable="bottom" decoration-muted="(state == 'done' and is_locked == True)"
+                      decoration-danger="qty_done&gt;product_uom_qty and state!='done' and parent.picking_type_code != 'incoming'"
+                      decoration-success="qty_done==product_uom_qty and state!='done' and not result_package_id">
                     <field name="note" placeholder="Add a note here"/>
                 </tree>
             </field>
         </record>
-        
+
 
         <record id="view_picking_internal_search_inherit" model="ir.ui.view">
             <field name="name">stock.picking.internal.search.inherit</field>
@@ -382,7 +406,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_warning_modal_wizard" model="ir.actions.act_window">
             <field name="name">Peringatan Koli</field>
             <field name="res_model">warning.modal.wizard</field>
-- 
cgit v1.2.3


From bd7479d645e90509c72a36b2dd9bcf9e6964bcae Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 5 Sep 2025 21:22:00 +0700
Subject: <miqdad> change field name

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index e230bccc..c8aa6454 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -101,7 +101,7 @@
                 </button>
                 <xpath expr="//field[@name='move_ids_without_package']//tree//field[@name='product_id']"
                        position="after">
-                    <field name="product_image_128" widget="image"
+                    <field name="product_image" widget="image"
                            style="height:128px;width:128px;" readonly="1"/>
                 </xpath>
                 <field name="backorder_id" position="after">
-- 
cgit v1.2.3


From 4bd34e21d8d4dc3b2f688e181fb05c6359ac1f43 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Sat, 6 Sep 2025 11:29:08 +0700
Subject: <miqdad> fix manufacture in stock move line & done

---
 indoteknik_custom/views/stock_move_line.xml | 9 +++++----
 indoteknik_custom/views/stock_picking.xml   | 7 ++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_move_line.xml b/indoteknik_custom/views/stock_move_line.xml
index 757d2522..94c0bf53 100644
--- a/indoteknik_custom/views/stock_move_line.xml
+++ b/indoteknik_custom/views/stock_move_line.xml
@@ -3,18 +3,19 @@
     <record id="stock_move_line_form_view_inherited" model="ir.ui.view">
         <field name="name">Stock Move Line</field>
         <field name="model">stock.move.line</field>
-        <field name="inherit_id" ref="stock.view_move_line_form" />
+        <field name="inherit_id" ref="stock.view_move_line_form"/>
+        <field name="priority" eval="100"/>
         <field name="arch" type="xml">
-            <field name="qty_done" position="after">
+            <xpath expr="(//form//group[.//field[@name='qty_done']])[last()]" position="inside">
                 <field name="manufacture"/>
-            </field>
+            </xpath>
         </field>
     </record>
 
     <record id="stock_move_line_tree_view_inherited" model="ir.ui.view">
         <field name="name">Stock Move Line</field>
         <field name="model">stock.move.line</field>
-        <field name="inherit_id" ref="stock.view_move_line_tree" />
+        <field name="inherit_id" ref="stock.view_move_line_tree"/>
         <field name="arch" type="xml">
             <field name="product_id" position="after">
                 <field name="manufacture"/>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index c8aa6454..50c5f261 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -99,7 +99,7 @@
                             attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"
                     />
                 </button>
-                <xpath expr="//field[@name='move_ids_without_package']//tree//field[@name='product_id']"
+                <xpath expr="//field[@name='move_ids_without_package']//tree//field[@name='product_uom']"
                        position="after">
                     <field name="product_image" widget="image"
                            style="height:128px;width:128px;" readonly="1"/>
@@ -140,6 +140,11 @@
                 <field name="scheduled_date" position="attributes">
                     <attribute name="readonly">1</attribute>
                 </field>
+                <xpath expr="//field[@name='move_ids_without_package']/form/group/field[@name='description_picking']"
+                       position="after">
+                    <field name="product_image" widget="image" string="Product Image"/>
+                </xpath>
+
                 <field name="origin" position="after">
                     <!--                    <field name="show_state_approve_md" invisible="1" optional="hide"/>-->
                     <field name="state_approve_md" widget="badge"/>
-- 
cgit v1.2.3


From f2adf9ad9ed7491a6ad5422d1236761e7d42c82f Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 8 Sep 2025 12:30:59 +0700
Subject: <Miqdad> remove image in tree view

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 50c5f261..fc8be790 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -99,11 +99,11 @@
                             attrs="{'invisible': [('state_approve_md', 'not in', ['waiting'])]}"
                     />
                 </button>
-                <xpath expr="//field[@name='move_ids_without_package']//tree//field[@name='product_uom']"
+                <!-- <xpath expr="//field[@name='move_ids_without_package']//tree//field[@name='product_uom']"
                        position="after">
                     <field name="product_image" widget="image"
                            style="height:128px;width:128px;" readonly="1"/>
-                </xpath>
+                </xpath> -->
                 <field name="backorder_id" position="after">
                     <field name="select_shipping_option_so"/>
                     <field name="shipping_method_so_id"/>
-- 
cgit v1.2.3