Merge branch 'odoo-backup' into feature/feedback_bitehisp

# Conflicts:
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 86 insertions, 7 deletions

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 72fdefa7..4c60a496 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -19,8 +19,9 @@
                     <field name="note" 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="final_seq"/>
-                    <field name="state_approve_md" widget="badge" decoration-success="state_approve_md == 'done'" decoration-warning="state_approve_md == 'pending'" />
+                    <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>
@@ -84,10 +85,15 @@
                     />
                 </button>
                 <field name="backorder_id" position="after">
+                    <field name="shipping_method_so_id"/>
                     <field name="summary_qty_detail"/>
                     <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="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)]}"/>
                 </field>
                 <field name="weight_uom_name" position="after">
                     <group>
@@ -142,6 +148,7 @@
                     <field name="approval_status"/>
                     <field name="approval_receipt_status"/>
                     <field name="approval_return_status"/>
+                    <field name="so_lama"/>
                 </field>
                 <field name="product_id" position="before">
                     <field name="line_no" attrs="{'readonly': 1}" optional="hide"/>
@@ -162,13 +169,14 @@
                             </group>
                         </group>
                     </page>
-                    <page string="Delivery" name="delivery_order">
+                    <page string="Delivery" name="delivery_order" attrs="{'invisible': [('location_dest_id', '=', 60)]}">
                         <group>
                             <group>
                                 <field name="notee"/>
                                 <field name="note_logistic"/>
                                 <field name="responsible" />
                                 <field name="carrier_id"/>
+                                <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')]}"/>
@@ -210,25 +218,67 @@
                             </group>
                         </group>
                     </page>
-                    <page string="Check Product" name="check_product">
+                    <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')]}">
                         <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')]}">
+                        <field name="konfirm_koli_lines"/>
+                    </page>
+                    <page string="Konfirm Koli" name="scan_koli" attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}">
+                        <field name="scan_koli_lines"/>
+                    </page>
                 </page>
                 
             </field>
         </record>
 
+        <record id="scan_koli_tree" model="ir.ui.view">
+            <field name="name">scan.koli.tree</field>
+            <field name="model">scan.koli</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom">
+                    <field name="koli_id" options="{'no_create': True}" required="1"  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)]"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="check_koli_tree" model="ir.ui.view">
+            <field name="name">check.koli.tree</field>
+            <field name="model">check.koli</field>
+            <field name="arch" type="xml">
+                <tree editable="bottom">    
+                    <field name="koli"/>
+                    <field name="reserved_id"/>
+                    <field name="check_koli_progress"/>
+                </tree>
+            </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"/>
+                    <field name="product_id" required="1" options="{'no_create': True}"/>
+                    <field name="quantity" readonly="1"/>
+                    <field name="status" readonly="1"/>
                 </tree>
             </field>
         </record>
@@ -265,6 +315,35 @@
                     <field name="purchase_representative_id"/>
                 </field>
             </field>
-        </record>          
+        </record>
+
+        <record id="view_warning_modal_wizard_form" model="ir.ui.view">
+            <field name="name">warning.modal.wizard.form</field>
+            <field name="model">warning.modal.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Peringatan Koli Belum Diperiksa">
+                    <sheet>
+                        <div class="oe_title">
+                            <h2><span>⚠️ Perhatian!</span></h2>
+                        </div>
+                        <group>
+                            <field name="message" readonly="1" nolabel="1" widget="text"/>
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="action_continue" type="object" string="Lanjutkan" class="btn-primary"/>
+                        <button string="Tutup" class="btn-secondary" special="cancel"/>
+                    </footer>
+                </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>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_warning_modal_wizard_form"/>
+            <field name="target">new</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file