Merge branch 'odoo-backup' into CR/repeat-order

1 files changed, 333 insertions, 183 deletions

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 0d190f37..0fabf279 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <odoo>
     <data>
         <record id="sale_order_form_view_inherit" model="ir.ui.view">
@@ -16,43 +16,72 @@
                             type="object"
                             attrs="{'invisible': [('approval_status', '=', ['approved'])]}"
                     />
+                    <button name="hold_unhold_qty_outgoing_so"
+                            string="Hold/Unhold Outgoing"
+                            type="object"
+                            attrs="{'invisible': [('state', 'in', ['cancel'])]}"
+                    />
+                    <button name="ask_retur_cancel_purchasing"
+                            string="Ask Cancel Purchasing"
+                            type="object"
+                            attrs="{'invisible': [('state', 'in', ['cancel'])]}"
+                    />
                     <button name="action_web_approve"
                             string="Web Approve"
                             type="object"
                             attrs="{'invisible': ['|', '|', ('create_uid', '!=', 25), ('web_approval', '!=', False), ('state', '!=', 'draft')]}"
                     />
-                    <button name="indoteknik_custom.action_view_uangmuka_penjualan" string="UangMuka"
-                        type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
+                    <button name="indoteknik_custom.action_view_uangmuka_penjualan"
+                            string="UangMuka"
+                            type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
                 </button>
                 <field name="payment_term_id" position="after">
                     <field name="create_uid" invisible="1"/>
                     <field name="create_date" invisible="1"/>
-                    <field name="shipping_cost_covered" attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-15'), ('create_date', '=', False)]}"/>
-                    <field name="shipping_paid_by" attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-15'), ('create_date', '=', False)]}"/>
+                    <field name="shipping_cost_covered"
+                           attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-15'), ('create_date', '=', False)]}"/>
+                    <field name="shipping_paid_by"
+                           attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-15'), ('create_date', '=', False)]}"/>
                     <field name="delivery_amt"/>
+                    <field name="ongkir_ke_xpdc"/>
+                    <field name="metode_kirim_ke_xpdc"/>
                     <field name="fee_third_party"/>
+                    <field name="biaya_lain_lain"/>
                     <field name="total_percent_margin"/>
+                    <field name="total_margin_excl_third_party" readonly="1"/>
                     <field name="type_promotion"/>
                     <label for="voucher_id"/>
                     <div class="o_row">
-                        <field name="voucher_id" id="voucher_id" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}"/>
-                        <field name="applied_voucher_id" invisible="1" />
-                        <button name="action_apply_voucher" type="object" string="Apply" confirm="Anda yakin untuk menggunakan voucher?" help="Apply the selected voucher" class="btn-link mb-1 px-0" icon="fa-plus" 
-                            attrs="{'invisible': ['|', '|', ('voucher_id', '=', False), ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}"
+                        <field name="voucher_id" id="voucher_id"
+                               attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}"/>
+                        <field name="applied_voucher_id" invisible="1"/>
+                        <button name="action_apply_voucher" type="object" string="Apply"
+                                confirm="Anda yakin untuk menggunakan voucher?"
+                                help="Apply the selected voucher" class="btn-link mb-1 px-0"
+                                icon="fa-plus"
+                                attrs="{'invisible': ['|', '|', ('voucher_id', '=', False), ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}"
                         />
-                        <button name="cancel_voucher" type="object" string="Cancel" confirm="Anda yakin untuk membatalkan penggunaan voucher?" help="Cancel applied voucher" class="btn-link mb-1 px-0" icon="fa-times" 
-                            attrs="{'invisible': ['|', ('applied_voucher_id', '=', False), ('state', 'not in', ['draft','sent'])]}"
+                        <button name="cancel_voucher" type="object" string="Cancel"
+                                confirm="Anda yakin untuk membatalkan penggunaan voucher?"
+                                help="Cancel applied voucher" class="btn-link mb-1 px-0" icon="fa-times"
+                                attrs="{'invisible': ['|', ('applied_voucher_id', '=', False), ('state', 'not in', ['draft','sent'])]}"
                         />
                     </div>
                     <label for="voucher_shipping_id"/>
                     <div class="o_row">
-                        <field name="voucher_shipping_id" id="voucher_shipping_id" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_shipping_id', '!=', False)]}"/>
-                        <field name="applied_voucher_shipping_id" invisible="1" />
-                        <button name="action_apply_voucher_shipping" type="object" string="Apply" confirm="Anda yakin untuk menggunakan voucher?" help="Apply the selected voucher" class="btn-link mb-1 px-0" icon="fa-plus" 
-                            attrs="{'invisible': ['|', '|', ('voucher_id', '=', False), ('state', 'not in', ['draft', 'sent']), ('applied_voucher_shipping_id', '!=', False)]}"
+                        <field name="voucher_shipping_id" id="voucher_shipping_id"
+                               attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_shipping_id', '!=', False)]}"/>
+                        <field name="applied_voucher_shipping_id" invisible="1"/>
+                        <button name="action_apply_voucher_shipping" type="object" string="Apply"
+                                confirm="Anda yakin untuk menggunakan voucher?"
+                                help="Apply the selected voucher" class="btn-link mb-1 px-0"
+                                icon="fa-plus"
+                                attrs="{'invisible': ['|', '|', ('voucher_id', '=', False), ('state', 'not in', ['draft', 'sent']), ('applied_voucher_shipping_id', '!=', False)]}"
                         />
-                        <button name="cancel_voucher_shipping" type="object" string="Cancel" confirm="Anda yakin untuk membatalkan penggunaan voucher?" help="Cancel applied voucher" class="btn-link mb-1 px-0" icon="fa-times" 
-                            attrs="{'invisible': ['|', ('applied_voucher_shipping_id', '=', False), ('state', 'not in', ['draft','sent'])]}"
+                        <button name="cancel_voucher_shipping" type="object" string="Cancel"
+                                confirm="Anda yakin untuk membatalkan penggunaan voucher?"
+                                help="Cancel applied voucher" class="btn-link mb-1 px-0" icon="fa-times"
+                                attrs="{'invisible': ['|', ('applied_voucher_shipping_id', '=', False), ('state', 'not in', ['draft','sent'])]}"
                         />
                     </div>
                     <button name="calculate_selling_price"
@@ -60,18 +89,25 @@
                             type="object"
                     />
                 </field>
+                <field name="approval_status" position="after">
+                    <field name="notes"/>
+                </field>
                 <field name="source_id" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </field>
                 <field name="user_id" position="after">
-                    <field name="helper_by_id" readonly="1"/>
-                    <field name="compute_fullfillment" invisible="1"/>
+                    <field name="hold_outgoing" readonly="1" />
+                    <field name="date_hold" readonly="1" widget="datetime" />
+                    <field name="date_unhold" readonly="1" widget="datetime" />
+                    <field name="helper_by_id" readonly="1" />
+                    <field name="compute_fullfillment" invisible="1" />
                 </field>
                 <field name="tag_ids" position="after">
                     <field name="eta_date_start"/>
                     <t t-esc="' to '"/>
                     <field name="eta_date" readonly="1"/>
-                    <field name="expected_ready_to_ship" />
+                    <field name="expected_ready_to_ship"/>
+                     <field name="ready_to_ship_status_detail"/>
                     <field name="flash_sale"/>
                     <field name="margin_after_delivery_purchase"/>
                     <field name="percent_margin_after_delivery_purchase"/>
@@ -79,9 +115,9 @@
                     <field name="pareto_status"/>
                 </field>
                 <field name="analytic_account_id" position="after">
-                    <field name="customer_type" required="1"/>
-                    <field name="npwp" placeholder='99.999.999.9-999.999' required="1"/>
-                    <field name="sppkp" attrs="{'required': [('customer_type', '=', 'pkp')]}"/>
+                    <field name="customer_type" readonly="1"/>
+                    <field name="npwp" placeholder='99.999.999.9-999.999' readonly="1"/>
+                    <field name="sppkp" attrs="{'required': [('customer_type', '=', 'pkp')]}" readonly="1"/>
                     <field name="email" required="1"/>
                     <field name="unreserve_id"/>
                     <field name="due_id" readonly="1"/>
@@ -96,8 +132,9 @@
                 <field name="partner_shipping_id" position="after">
                     <field name="real_shipping_id"/>
                     <field name="real_invoice_id"/>
-                    <field name="approval_status" />
-                    <field name="sales_tax_id" domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1"/>
+                    <field name="approval_status"/>
+                    <field name="sales_tax_id"
+                           domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1"/>
                     <field name="carrier_id" required="1"/>
                     <field name="delivery_service_type" readonly="1"/>
                     <field name="shipping_option_id"/>
@@ -106,20 +143,26 @@
                     <field name="date_doc_kirim" readonly="1"/>
                     <field name="notification" readonly="1"/>
                 </field>
-                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']" position="attributes">
+                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']"
+                       position="attributes">
                     <attribute name="attrs">
-                        {'readonly': [('state', 'in', ('done','cancel'))]}
+                        {'readonly': [('state', 'in', ('done', 'cancel'))]}
                     </attribute>
                 </xpath>
-                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree" position="inside">
+                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree"
+                       position="inside">
                     <field name="desc_updatable" invisible="1"/>
                 </xpath>
-                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='name']" position="attributes">
+                <xpath
+                        expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='name']"
+                        position="attributes">
                     <attribute name="modifiers">
                         {'readonly': [('desc_updatable', '=', False)]}
                     </attribute>
                 </xpath>
-                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="attributes">
+                <xpath
+                        expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']"
+                        position="attributes">
                     <attribute name="attrs">
                         {
                             'readonly': [
@@ -131,25 +174,28 @@
                     </attribute>
                 </xpath>
                 <div name="invoice_lines" position="before">
-                    <div name="vendor_id" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}">
+                    <div name="vendor_id" groups="base.group_no_one"
+                         attrs="{'invisible': [('display_type', '!=', False)]}">
                         <label for="vendor_id"/>
                         <div name="vendor_id">
-                            <field name="vendor_id" 
-                                   attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" 
-                                   domain="[('parent_id', '=', False)]" 
-                                   options="{'no_create': True}" class="oe_inline" />
+                            <field name="vendor_id"
+                                   attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}"
+                                   domain="[('parent_id', '=', False)]"
+                                   options="{'no_create': True}" class="oe_inline"/>
                         </div>
                     </div>
                 </div>
-                
+
                 <div name="invoice_lines" position="before">
-                    <div name="purchase_price" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}">
+                    <div name="purchase_price" groups="base.group_no_one"
+                         attrs="{'invisible': [('display_type', '!=', False)]}">
                         <label for="purchase_price"/>
                         <field name="purchase_price"/>
                     </div>
                 </div>
                 <div name="invoice_lines" position="before">
-                    <div name="purchase_tax_id" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}">
+                    <div name="purchase_tax_id" groups="base.group_no_one"
+                         attrs="{'invisible': [('display_type', '!=', False)]}">
                         <label for="purchase_tax_id"/>
                         <div name="purchase_tax_id">
                             <field name="purchase_tax_id"/>
@@ -157,22 +203,29 @@
                     </div>
                 </div>
                 <div name="invoice_lines" position="before">
-                    <div name="item_percent_margin" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}">
+                    <div name="item_percent_margin" groups="base.group_no_one"
+                         attrs="{'invisible': [('display_type', '!=', False)]}">
                         <label for="item_percent_margin"/>
                         <field name="item_percent_margin"/>
                     </div>
                 </div>
                 <div name="invoice_lines" position="before">
-                    <div name="price_subtotal" groups="base.group_no_one" attrs="{'invisible': [('display_type', '!=', False)]}">
+                    <div name="price_subtotal" groups="base.group_no_one"
+                         attrs="{'invisible': [('display_type', '!=', False)]}">
                         <label for="price_subtotal"/>
                         <field name="price_subtotal"/>
                     </div>
                 </div>
-                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
+                <xpath
+                        expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']"
+                        position="after">
                     <field name="qty_free_bu" optional="hide"/>
-                    <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')], 'invisible': [('display_type', '!=', False)]}" domain="[('parent_id', '=', False)]" options="{'no_create':True}"/>
+                    <field name="vendor_id"
+                           attrs="{'readonly': [('parent.approval_status', '=', 'approved')], 'invisible': [('display_type', '!=', False)]}"
+                           domain="[('parent_id', '=', False)]" options="{'no_create':True}"/>
                     <field name="vendor_md_id" optional="hide"/>
-                    <field name="purchase_price" attrs="
+                    <field name="purchase_price"
+                           attrs="
                         {
                             'readonly': [
                                 '|',
@@ -182,44 +235,60 @@
                         }
                     "/>
                     <field name="purchase_price_md" optional="hide"/>
-                    <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]" options="{'no_create':True}"/>
+                    <field name="purchase_tax_id"
+                           attrs="{'readonly': [('parent.approval_status', '!=', False)]}"
+                           domain="[('type_tax_use','=','purchase')]" options="{'no_create':True}"/>
                     <field name="item_percent_margin"/>
                     <field name="item_margin" optional="hide"/>
                     <field name="margin_md" optional="hide"/>
                     <field name="note" optional="hide"/>
                     <field name="note_procurement" optional="hide"/>
                     <field name="vendor_subtotal" optional="hide"/>
-                    <field name="weight" optional="hide"/>  
+                    <field name="weight" optional="hide"/>
                     <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide"/>
                     <field name="order_promotion_id" string="Promotion" readonly="1" optional="hide"/>
                 </xpath>
-                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']" position="before">
+                <xpath
+                        expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']"
+                        position="before">
                     <field name="line_no" readonly="1" optional="hide"/>
                 </xpath>
-                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='qty_delivered']" position="before">
+                <xpath
+                        expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='qty_delivered']"
+                        position="before">
                     <field name="qty_reserved" invisible="1"/>
                     <field name="reserved_from" readonly="1" optional="hide"/>
                 </xpath>
-                <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']" position="attributes">
+                <xpath
+                        expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='product_id']"
+                        position="attributes">
                     <attribute name="options">{'no_create': True}</attribute>
                 </xpath>
-                <!-- <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='tax_id']" position="attributes">
+                <!-- <xpath
+                expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='tax_id']"
+                position="attributes">
                     <attribute name="required">1</attribute>
                 </xpath> -->
                 <field name="amount_total" position="after">
                     <field name="grand_total"/>
-                    <label for="amount_voucher_disc" string="Voucher" />
+                    <label for="amount_voucher_disc" string="Voucher"/>
                     <div>
-                        <field class="mb-0" name="amount_voucher_disc" string="Voucher" readonly="1"/> 
-                        <div class="text-right mb-2"><small>*Hanya informasi</small></div>
+                        <field class="mb-0" name="amount_voucher_disc" string="Voucher" readonly="1"/>
+                        <div class="text-right mb-2">
+                            <small>*Hanya informasi</small>
+                        </div>
                     </div>
-                    <label for="amount_voucher_shipping_disc" string="Voucher Shipping" />
+                    <label for="amount_voucher_shipping_disc" string="Voucher Shipping"/>
                     <div>
-                        <field class="mb-0" name="amount_voucher_shipping_disc" string="Voucher Shipping" readonly="1"/> 
-                        <div class="text-right mb-2"><small>*Hanya informasi</small></div>
+                        <field class="mb-0" name="amount_voucher_shipping_disc"
+                               string="Voucher Shipping" readonly="1"/>
+                        <div class="text-right mb-2">
+                            <small>*Hanya informasi</small>
+                        </div>
                     </div>
                     <field name="total_margin"/>
                     <field name="total_percent_margin"/>
+                    <field name="total_before_margin"/>
                 </field>
                 <field name="effective_date" position="after">
                     <field name="carrier_id"/>
@@ -229,7 +298,14 @@
                 </field>
                 <field name="carrier_id" position="attributes">
                     <attribute name="attrs">
-                        {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in', ['cancel','draft'])]}
+                        {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
+                                                                             ['cancel', 'draft'])]}
+                    </attribute>
+                </field>
+                <field name="payment_term_id" position="attributes">
+                    <attribute name="attrs">
+                        {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
+                                                                             ['cancel', 'draft'])]}
                     </attribute>
                 </field>
 
@@ -259,15 +335,15 @@
                     <page string="Promotion" name="page_promotion">
                         <field name="order_promotion_ids" readonly="1">
                             <tree options="{'no_open': True}">
-                                <field name="program_line_id" />
-                                <field name="quantity" />
-                                <field name="is_applied" />
+                                <field name="program_line_id"/>
+                                <field name="quantity"/>
+                                <field name="is_applied"/>
                             </tree>
                             <form>
                                 <group>
-                                    <field name="program_line_id" />
-                                    <field name="quantity" />
-                                    <field name="is_applied" />
+                                    <field name="program_line_id"/>
+                                    <field name="quantity"/>
+                                    <field name="is_applied"/>
                                 </group>
                             </form>
                         </field>
@@ -282,36 +358,41 @@
                         <field name="fulfillment_line_v2" readonly="1"/>
                     </page>
                     <page string="Reject Line" name="page_sale_order_reject_line">
-                        <field name="reject_line" readonly="1"/>
+                        <field name="reject_line" readonly="0"/>
+                    </page>
+                    <page string="Koli" name="page_sales_order_koli_line">
+                        <field name="koli_lines" readonly="1"/>
                     </page>
                 </page>
             </field>
         </record>
-          <!-- Wizard for Reject Reason -->
-            <record id="view_cancel_reason_order_form" model="ir.ui.view">
-                <field name="name">cancel.reason.order.form</field>
-                <field name="model">cancel.reason.order</field>
-                <field name="arch" type="xml">
-                    <form string="Cancel Reason">
-                        <group>
-                            <field name="reason_cancel" widget="selection"/>
-                            <field name="attachment_bukti" widget="many2many_binary" required="1"/>
-                            <field name="nomor_so_pengganti" attrs="{'invisible': [('reason_cancel', '!=', 'ganti_quotation')]}"/>
-                        </group>
-                        <footer>
-                            <button string="Confirm" type="object" name="confirm_reject" class="btn-primary"/>
-                            <button string="Cancel" class="btn-secondary" special="cancel"/>
-                        </footer>
-                    </form>
-                </field>
-            </record>
+        <!-- Wizard for Reject Reason -->
+        <record id="view_cancel_reason_order_form" model="ir.ui.view">
+            <field name="name">cancel.reason.order.form</field>
+            <field name="model">cancel.reason.order</field>
+            <field name="arch" type="xml">
+                <form string="Cancel Reason">
+                    <group>
+                        <field name="reason_cancel" widget="selection"/>
+                        <field name="attachment_bukti" widget="many2many_binary" required="1"/>
+                        <field name="nomor_so_pengganti"
+                               attrs="{'invisible': [('reason_cancel', '!=', 'ganti_quotation')]}"/>
+                    </group>
+                    <footer>
+                        <button string="Confirm" type="object" name="confirm_reject"
+                                class="btn-primary"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
 
-            <record id="action_cancel_reason_order" model="ir.actions.act_window">
-                <field name="name">Cancel Reason</field>
-                <field name="res_model">cancel.reason.order</field>
-                <field name="view_mode">form</field>
-                <field name="target">new</field>
-            </record>
+        <record id="action_cancel_reason_order" model="ir.actions.act_window">
+            <field name="name">Cancel Reason</field>
+            <field name="res_model">cancel.reason.order</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
     </data>
     <data>
         <record id="sale_order_tree_view_inherit" model="ir.ui.view">
@@ -320,12 +401,14 @@
             <field name="inherit_id" ref="sale.view_quotation_tree_with_onboarding"/>
             <field name="arch" type="xml">
                 <field name="state" position="after">
-                    <field name="approval_status" />
+                    <field name="approval_status"/>
                     <field name="client_order_ref"/>
+                    <field name="notes"/>
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
                     <field name="pareto_status" optional="hide"/>
                     <field name="shipping_method_picking" optional="hide"/>
+                    <field name="hold_outgoing" optional="hide"/>
                 </field>
             </field>
         </record>
@@ -335,7 +418,7 @@
             <field name="inherit_id" ref="sale.view_order_tree"/>
             <field name="arch" type="xml">
                 <field name="state" position="after">
-                    <field name="approval_status" />
+                    <field name="approval_status"/>
                     <field name="client_order_ref"/>
                     <field name="so_status"/>
                     <field name="date_status_done"/>
@@ -374,32 +457,67 @@
             <field name="email_to">${object.partner_id.email | safe}</field>
             <field name="email_cc">${object.partner_id.get_approve_partner_ids("email_comma_sep")}</field>
             <field name="body_html" type="html">
-                <table border="0" cellpadding="0" cellspacing="0" style="padding: 16px 0; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;">
-                    <tr><td align="center">
-                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="font-size: 13px; padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
-                            <tbody>
-                                <tr>
-                                    <td align="center" style="min-width: 590px;">
-                                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
-                                            <tr><td style="padding-bottom: 24px;">Dear ${(object.partner_id.get_main_parent()).name},</td></tr>
+                <table border="0" cellpadding="0" cellspacing="0"
+                       style="padding: 16px 0; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;">
+                    <tr>
+                        <td align="center">
+                            <table border="0" cellpadding="0" cellspacing="0" width="590"
+                                   style="font-size: 13px; padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
+                                <tbody>
+                                    <tr>
+                                        <td align="center" style="min-width: 590px;">
+                                            <table border="0" cellpadding="0" cellspacing="0"
+                                                   width="590"
+                                                   style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                                <tr>
+                                                    <td style="padding-bottom: 24px;">
+                                                        Dear
+                                                        ${(object.partner_id.get_main_parent()).name},</td>
+                                                </tr>
 
-                                            <tr><td style="padding-bottom: 16px;">Ini adalah konfirmasi pesanan dari ${object.partner_id.name | safe} untuk nomor pesanan ${object.name} yang memerlukan persetujuan agar dapat diproses.</td></tr>
-                                            <tr><td style="padding-bottom: 16px;">
-                                                <a href="https://indoteknik.com/my/quotations/${object.id}" style="color: white; background-color: #C53030; border: none; border-radius: 6px; padding: 4px 8px; width: fit-content; display: block;">
-                                                    Lihat Pesanan
-                                                </a>
-                                            </td></tr>
-                                            <tr><td style="padding-bottom: 16px;">Mohon segera melakukan tinjauan terhadap pesanan ini dan memberikan persetujuan. Terima kasih atas perhatian dan kerjasama Anda. Kami berharap dapat segera melanjutkan proses pesanan ini setelah mendapatkan persetujuan Anda.</td></tr>
+                                                <tr>
+                                                    <td style="padding-bottom: 16px;">Ini adalah
+                                                        konfirmasi pesanan dari
+                                                        ${object.partner_id.name | safe} untuk nomor
+                                                        pesanan ${object.name} yang memerlukan
+                                                        persetujuan agar dapat diproses.</td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="padding-bottom: 16px;">
+                                                        <a
+                                                                href="https://indoteknik.com/my/quotations/${object.id}"
+                                                                style="color: white; background-color: #C53030; border: none; border-radius: 6px; padding: 4px 8px; width: fit-content; display: block;">
+                                                            Lihat Pesanan
+                                                        </a>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="padding-bottom: 16px;">Mohon segera
+                                                        melakukan tinjauan terhadap pesanan ini dan
+                                                        memberikan persetujuan. Terima kasih atas
+                                                        perhatian dan kerjasama Anda. Kami berharap
+                                                        dapat segera melanjutkan proses pesanan ini
+                                                        setelah mendapatkan persetujuan Anda.</td>
+                                                </tr>
 
-                                            <tr><td style="padding-bottom: 2px;">Hormat kami,</td></tr>
-                                            <tr><td style="padding-bottom: 2px;">PT. Indoteknik Dotcom Gemilang</td></tr>
-                                            <tr><td style="padding-bottom: 2px;">sales@indoteknik.com</td></tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                    </td></tr>
+                                                <tr>
+                                                    <td style="padding-bottom: 2px;">Hormat kami,</td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="padding-bottom: 2px;">PT. Indoteknik
+                                                        Dotcom Gemilang</td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="padding-bottom: 2px;">
+                                                        sales@indoteknik.com</td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </td>
+                    </tr>
                 </table>
             </field>
         </record>
@@ -422,24 +540,38 @@
     </data>
 
     <data>
-
-    </data>
-        <record id="sales_order_fulfillment_v2_tree" model="ir.ui.view">
-            <field name="name">sales.order.fulfillment.v2.tree</field>
-            <field name="model">sales.order.fulfillment.v2</field>
+        <record id="sales_order_koli_tree" model="ir.ui.view">
+            <field name="name">sales.order.koli.tree</field>
+            <field name="model">sales.order.koli</field>
             <field name="arch" type="xml">
-                <tree editable="top" create="false">
-                    <field name="product_id" readonly="1"/>
-                    <field name="so_qty" readonly="1" optional="show"/>
-                    <field name="reserved_stock_qty" readonly="1" optional="show"/>
-                    <field name="delivered_qty" readonly="1" optional="hide"/>
-                    <field name="po_ids" widget="many2many_tags" readonly="1" optional="show"/>
-                    <field name="po_qty" readonly="1" optional="show"/>
-                    <field name="received_qty" readonly="1" optional="show"/>
-                    <field name="purchaser" readonly="1" optional="hide"/>
+                <tree editable="top" create="false" delete="false">
+                    <field name="koli_id" readonly="1"/>
+                    <field name="picking_id" readonly="1"/>
+                    <field name="state" readonly="1"/>
                 </tree>
             </field>
         </record>
+    </data>
+
+    <data>
+
+    </data>
+    <record id="sales_order_fulfillment_v2_tree" model="ir.ui.view">
+        <field name="name">sales.order.fulfillment.v2.tree</field>
+        <field name="model">sales.order.fulfillment.v2</field>
+        <field name="arch" type="xml">
+            <tree editable="top" create="false">
+                <field name="product_id" readonly="1"/>
+                <field name="so_qty" readonly="1" optional="show"/>
+                <field name="reserved_stock_qty" readonly="1" optional="show"/>
+                <field name="delivered_qty" readonly="1" optional="hide"/>
+                <field name="po_ids" widget="many2many_tags" readonly="1" optional="show"/>
+                <field name="po_qty" readonly="1" optional="show"/>
+                <field name="received_qty" readonly="1" optional="show"/>
+                <field name="purchaser" readonly="1" optional="hide"/>
+            </tree>
+        </field>
+    </record>
     <data>
         <record id="sales_order_fullfillmet_tree" model="ir.ui.view">
             <field name="name">sales.order.fullfillment.tree</field>
@@ -463,7 +595,7 @@
                 <tree editable="top" create="false">
                     <field name="product_id" readonly="1"/>
                     <field name="qty_reject" readonly="1"/>
-                    <field name="reason_reject" readonly="1"/>
+                    <field name="reason_reject" readonly="0"/>
                 </tree>
             </field>
         </record>
@@ -487,61 +619,79 @@
             <field name="email_from">sales@indoteknik.com</field>
             <field name="email_to">${object.user_id.login | safe}</field>
             <field name="body_html" type="html">
-                <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;">
-                    <tr><td align="center">
-                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="font-size: 13px; padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
-                            <!-- HEADER -->
-                            <tbody>
-                                <tr>
-                                    <td align="center" style="min-width: 590px;">
-                                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
-                                            <tr>
-                                                <td valign="middle">
-                                                    <span></span>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                                <!-- CONTENT -->
-                                <tr>
-                                    <td align="center" style="min-width: 590px;">
-                                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
-                                            <tr><td style="padding-bottom: 24px;">Dear ${salesperson_name},</td></tr>
-    
-                                            <tr><td style="padding-bottom: 16px;">Terdapat pesanan dari BP ${business_partner} untuk site ${site} dengan total belanja ${sum_total_amount} dari list SO dibawah ini:</td></tr>
-    
-                                            <tr>
-                                                <td>
-                                                    <table border="1" cellpadding="5" cellspacing="0">
-                                                        <thead>
-                                                            <tr>
-                                                                <th>Nama Pesanan</th>
-                                                                <th>Nama Perusahaan Induk</th>
-                                                                <th>Nama Situs</th>
-                                                                <th>Total Pembelian</th>
-                                                            </tr>
-                                                        </thead>
-                                                        <tbody>
-                                                            ${table_content}
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-    
-                                            <tr>
-                                                <td style="text-align:center;">
-                                                    <hr width="100%"
-                                                        style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
-                                                </td>
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                                <!-- CONTENT -->
-                            </tbody>
-                        </table>
-                    </td></tr>
+                <table border="0" cellpadding="0" cellspacing="0"
+                       style="padding-top: 16px; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;">
+                    <tr>
+                        <td align="center">
+                            <table border="0" cellpadding="0" cellspacing="0" width="590"
+                                   style="font-size: 13px; padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
+                                <!-- HEADER -->
+                                <tbody>
+                                    <tr>
+                                        <td align="center" style="min-width: 590px;">
+                                            <table border="0" cellpadding="0" cellspacing="0"
+                                                   width="590"
+                                                   style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                                <tr>
+                                                    <td valign="middle">
+                                                        <span></span>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    <!-- CONTENT -->
+                                    <tr>
+                                        <td align="center" style="min-width: 590px;">
+                                            <table border="0" cellpadding="0" cellspacing="0"
+                                                   width="590"
+                                                   style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                                <tr>
+                                                    <td style="padding-bottom: 24px;">Dear
+                                                        ${salesperson_name},</td>
+                                                </tr>
+
+                                                <tr>
+                                                    <td style="padding-bottom: 16px;">Terdapat
+                                                        pesanan dari BP ${business_partner} untuk
+                                                        site ${site} dengan total belanja
+                                                        ${sum_total_amount} dari list SO dibawah
+                                                        ini:</td>
+                                                </tr>
+
+                                                <tr>
+                                                    <td>
+                                                        <table border="1" cellpadding="5"
+                                                               cellspacing="0">
+                                                            <thead>
+                                                                <tr>
+                                                                    <th>Nama Pesanan</th>
+                                                                    <th>Nama Perusahaan Induk</th>
+                                                                    <th>Nama Situs</th>
+                                                                    <th>Total Pembelian</th>
+                                                                </tr>
+                                                            </thead>
+                                                            <tbody>
+                                                                ${table_content}
+                                                            </tbody>
+                                                        </table>
+                                                    </td>
+                                                </tr>
+
+                                                <tr>
+                                                    <td style="text-align:center;">
+                                                        <hr width="100%"
+                                                            style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;"/>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    <!-- CONTENT -->
+                                </tbody>
+                            </table>
+                        </td>
+                    </tr>
                 </table>
             </field>
         </record>