Merge branch 'odoo-production' into iman/switch-account

1 files changed, 61 insertions, 0 deletions

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 1893fcaf..8acba608 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -56,10 +56,22 @@
                             string="Biteship"
                             type="object"
                     />
+                    <button name="track_envio_shipment"
+                            string="Tracking Envio"
+                            type="object"
+                            attrs="{'invisible': [('carrier_id', '!=', 151)]}"
+                    />
+                    <button name="action_fetch_lalamove_order"
+                            string="Tracking Lalamove"
+                            type="object"
+                            attrs="{'invisible': [('carrier_id', '!=', 9)]}"
+                    />
                 </button>
                 <field name="backorder_id" position="after">
                     <field name="summary_qty_detail"/>
                     <field name="count_line_detail"/>
+                    <field name="dokumen_tanda_terima"/>
+                    <field name="dokumen_pengiriman"/>
                 </field>
                 <field name="weight_uom_name" position="after">
                     <group>
@@ -74,6 +86,9 @@
                 <field name="partner_id" position="after">
                     <field name="real_shipping_id"/>
                 </field>
+                <field name="product_uom_qty" position="attributes">
+                    <attribute name="attrs">{'readonly': [('parent.picking_type_code', '=', 'incoming')]}</attribute>
+                </field>
                 <field name="date_done" position="after">
                     <field name="arrival_time"/>
                 </field>
@@ -115,6 +130,8 @@
                 </field>
                 <field name="product_uom" position="after">
                     <field name="sale_id" attrs="{'readonly': 1}" optional="hide"/>
+                    <field name="print_barcode" optional="hide"/>
+                    <field name="qr_code_variant" widget="image" optional="hide"/>
                 </field>
                 <page name="note" position="after">
                     <page string="E-Faktur" name="efaktur" attrs="{'invisible': [['is_internal_use', '=', False]]}">
@@ -143,13 +160,57 @@
                                 <field name="sj_documentation" widget="image" />
                                 <field name="paket_documentation" widget="image" />
                             </group>
+                            <group attrs="{'invisible': [('carrier_id', '!=', 151)]}">
+                                <field name="envio_id" invisible="1"/>
+                                <field name="envio_code"/>
+                                <field name="envio_ref_code"/>
+                                <field name="envio_eta_at"/>
+                                <field name="envio_ata_at"/>
+                                <field name="envio_etd_at" invisible="1"/>
+                                <field name="envio_atd_at" invisible="1"/>
+                                <field name="envio_received_by"/>
+                                <field name="envio_status"/>
+                                <field name="envio_cod_value" invisible="1"/>
+                                <field name="envio_cod_status" invisible="1"/>
+                                <field name="envio_latest_message"/>
+                                <field name="envio_latest_recorded_at"/>
+                                <field name="envio_latest_latitude" invisible="1"/>
+                                <field name="envio_latest_longitude" invisible="1"/>
+                                <field name="tracking_by" invisible="1"/>
+                            </group>
+                            <group attrs="{'invisible': [('carrier_id', '!=', 9)]}">
+                                <field name="lalamove_data" invisible="1"/>
+                                <field name="lalamove_order_id"/>
+                                <field name="lalamove_address"/>
+                                <field name="lalamove_name"/>
+                                <field name="lalamove_phone"/>
+                                <field name="lalamove_status"/>
+                                <field name="lalamove_delivered_at"/>
+                                <field name="lalamove_image_url" invisible="1"/>
+                                <field name="lalamove_image_html"/>
+                            </group>
                         </group>
                     </page>
+                    <!-- <page string="Check Product" name="check_product">
+                        <field name="check_product_lines"/>
+                    </page> -->
                 </page>
                 
             </field>
         </record>
 
+        <!-- <record id="check_product_tree" model="ir.ui.view">
+            <field name="name">check.product.tree</field>
+            <field name="model">check.product</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom" decoration-warning="status == 'Pending'" decoration-success="status == 'Done'">
+                    <field name="product_id"/>
+                    <field name="quantity"/>
+                    <field name="status"/>
+                </tree>
+            </field>
+        </record> -->
+
         <record id="view_stock_move_line_detailed_operation_tree_inherit" model="ir.ui.view">
             <field name="name">stock.move.line.operations.tree.inherit</field>
             <field name="model">stock.move.line</field>