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