Merge branch 'odoo-backup' into locatorlocator

# Conflicts:
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/stock_move.py
#	indoteknik_custom/security/ir.model.access.csv
#	indoteknik_custom/views/stock_picking.xml

1 files changed, 46 insertions, 6 deletions

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 7668946c..bad85963 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -23,6 +23,7 @@
                     <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="is_so_fiktif" optional="hide" readonly="1"/>
                     <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"/>
@@ -115,6 +116,7 @@
                        position="after">
                     <field name="product_image" widget="image"
                            style="height:128px;width:128px;" readonly="1"/>
+
                 </xpath> -->
                 <field name="backorder_id" position="after">
                     <field name="select_shipping_option_so"/>
@@ -147,7 +149,7 @@
                     <attribute name="attrs">{'readonly': [('parent.picking_type_code', '=', 'incoming')]}</attribute>
                 </field> -->
                 <field name="date_done" position="after">
-                    <field name="arrival_time"/>
+                    <field name="arrival_time" attrs="{'invisible': [('picking_type_id', 'in', [29,30])]}"/>
                 </field>
                 <field name="scheduled_date" position="attributes">
                     <attribute name="readonly">1</attribute>
@@ -162,11 +164,13 @@
 
                 <field name="origin" position="after">
                     <!--                    <field name="show_state_approve_md" invisible="1" optional="hide"/>-->
-                    <field name="state_approve_md" widget="badge"/>
+                    <field name="state_approve_md" widget="badge"
+                           attrs="{'invisible': [('picking_type_id', 'in', [29,30])]}"/>
                     <field name="purchase_id"/>
                     <field name="sale_order"/>
                     <field name="invoice_status"/>
-                    <field name="is_bu_iu" />
+                    <field name="is_bu_iu"/>
+                    <field name="is_so_fiktif" readonly="1"/>
                     <field name="approval_status" attrs="{'invisible': [('is_bu_iu', '=', False)]}"/>
                     <field name="date_doc_kirim" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
                     <field name="summary_qty_operation"/>
@@ -180,6 +184,7 @@
                            'required': [['is_internal_use', '=', True]]
                            }"
                     />
+                    <field name="so_num" attrs="{'invisible': [('picking_type_id', 'not in', [29,30,73,74])]}"/>
                 </field>
                 <field name="group_id" position="before">
                     <field name="date_reserved"/>
@@ -226,6 +231,10 @@
                         <group>
                             <group>
                                 <field name="notee"/>
+                                <field name="qty_yang_mau_dikirim"/>
+                                <field name="qty_terkirim"/>
+                                <field name="qty_gantung"/>
+                                <field name="delivery_status"/>
                                 <field name="note_logistic"/>
                                 <field name="note_info"/>
                                 <field name="responsible"/>
@@ -244,6 +253,16 @@
                                        attrs="{'invisible': [('select_shipping_option_so', '=', 'biteship')]}"/>
                                 <field name="driver_id"/>
                                 <field name='sj_return_date'/>
+                                <field name="sj_documentations" context="{'default_picking_id': active_id}">
+                                    <tree editable="bottom">
+                                        <field name="image" widget="image" options="{'size':[128,128]}"/>
+                                    </tree>
+                                    <form>
+                                        <group>
+                                            <field name="image" widget="image" options="{'size':[512,512]}"/>
+                                        </group>
+                                    </form>
+                                </field>
                                 <field name="sj_documentation" widget="image"/>
                                 <field name="paket_documentation" widget="image"/>
                                 <field name="dispatch_documentation" widget="image"/>
@@ -325,6 +344,22 @@
             </field>
         </record>
 
+        <record id="view_picking_form_inherit_ribbon" model="ir.ui.view">
+            <field name="name">stock.picking.form.ribbon</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="arch" type="xml">
+                <!-- Sisipkan sebelum elemen dengan class oe_title -->
+                <xpath expr="//sheet/div[@class='oe_title']" position="before">
+                    <widget name="web_ribbon"
+                            title="FIKTIF"
+                            bg_color="bg-danger"
+                            attrs="{'invisible': [('is_so_fiktif', '=', False)]}"/>
+                </xpath>
+            </field>
+        </record>
+
+
         <record id="scan_koli_tree" model="ir.ui.view">
             <field name="name">scan.koli.tree</field>
             <field name="model">scan.koli</field>
@@ -394,8 +429,11 @@
                       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"/>
-                    <field name="outstanding_qty"/>
-                    <field name="delivery_status" widget="badge" options="{'colors': {'full': 'success', 'partial': 'warning', 'partial_final': 'danger'}}"/>
+                    <field name="qty_yang_mau_dikirim"/>
+                    <field name="qty_terkirim"/>
+                    <field name="qty_gantung"/>
+                    <field name="delivery_status" widget="badge"
+                           options="{'colors': {'full': 'success', 'partial': 'warning', 'partial_final': 'danger'}}"/>
                 </tree>
             </field>
         </record>
@@ -419,7 +457,9 @@
                 <form string="Peringatan Koli Belum Diperiksa">
                     <sheet>
                         <div class="oe_title">
-                            <h2><span>⚠️ Perhatian!</span></h2>
+                            <h2>
+                                <span>⚠️ Perhatian!</span>
+                            </h2>
                         </div>
                         <group>
                             <field name="message" readonly="1" nolabel="1" widget="text"/>