<hafid> merging odoo-backup

1 files changed, 31 insertions, 7 deletions

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index ae77ab9a..f9200dfa 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -17,6 +17,7 @@
                     <field name="driver_arrival_date" optional="hide"/>
                     <field name="note_logistic" optional="hide"/>
                     <field name="note" optional="hide"/>
+                    <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"/>
@@ -49,11 +50,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"
@@ -63,6 +64,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="track_envio_shipment"
                             string="Tracking Envio"
                             type="object"
@@ -91,7 +98,9 @@
                     />
                 </button>
                 <field name="backorder_id" position="after">
+                    <field name="select_shipping_option_so"/>
                     <field name="shipping_method_so_id"/>
+                    <field name="shipping_option_so_id"/>
                     <field name="summary_qty_detail"/>
                     <field name="count_line_detail"/>
                     <field name="dokumen_tanda_terima"/>
@@ -183,18 +192,33 @@
                                 <field name="note_logistic"/>
                                 <field name="note_info"/>
                                 <field name="responsible" />
-                                <field name="carrier_id"/>
+                                <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="driver_arrival_date"/>
-                                <field name="delivery_tracking_no"/>
+                                <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" />
                             </group>
+                            <!-- Biteship Group -->
+                            <group attrs="{'invisible': [('select_shipping_option_so', '!=', 'biteship')]}">
+                                <field name="delivery_tracking_no" />
+                                <field name="shipping_method_so_id"/>
+                                <field name="shipping_option_so_id"/>
+                                <field name="biteship_shipping_price" readonly="1"/>
+                                <field name="currency_id" invisible="1"/>
+                                <field name="biteship_shipping_status" readonly="1"/>
+                                <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"/>
+                            </group>
+
                             <group attrs="{'invisible': [('carrier_id', '!=', 151)]}">
                                 <field name="envio_id" invisible="1"/>
                                 <field name="envio_code"/>