(andri) resolved conflict

12 files changed, 460 insertions, 390 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 17263c3a..46737a40 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -92,6 +92,7 @@
                     <field name="is_efaktur_exported" optional="hide"/>
                     <field name="invoice_day_to_due" attrs="{'invisible': [['payment_state', 'in', ('paid', 'in_payment', 'reversed')]]}" optional="hide"/>
                     <field name="new_invoice_day_to_due" attrs="{'invisible': [['payment_state', 'in', ('paid', 'in_payment', 'reversed')]]}" optional="hide"/>
+                    <field name="length_of_payment" optional="hide"/>
                     <field name="mark_upload_efaktur" optional="hide" widget="badge" 
                     decoration-danger="mark_upload_efaktur == 'belum_upload'"  
                     decoration-success="mark_upload_efaktur == 'sudah_upload'" />
diff --git a/indoteknik_custom/views/barcoding_product.xml b/indoteknik_custom/views/barcoding_product.xml
index 55876580..b259f1e8 100644
--- a/indoteknik_custom/views/barcoding_product.xml
+++ b/indoteknik_custom/views/barcoding_product.xml
@@ -20,6 +20,7 @@
                 <tree>
                     <field name="product_id"/>
                     <field name="qr_code_variant" widget="image"/>
+                    <field name="sequence_with_total" attrs="{'invisible': [['parent.type', 'not in', ('multiparts')]]}"/>
                 </tree>
             </field>
         </record>
@@ -35,8 +36,8 @@
                                 <field name="product_id" required="1"/>
                                 <field name="type" required="1"/>
                                 <field name="quantity" attrs="{'invisible': [['type', 'in', ('barcoding','barcoding_box')]], 'required': [['type', 'not in', ('barcoding')]]}"/>
-                                <field name="barcode" attrs="{'invisible': [['type', 'in', ('print')]], 'required': [['type', 'not in', ('print')]]}"/>
-                                <field name="qty_pcs_box" attrs="{'invisible': [['type', 'in', ('print','barcoding')]], 'required': [['type', 'not in', ('print', 'barcoding')]]}"/>
+                                <field name="barcode" attrs="{'invisible': [['type', 'in', ('print','multiparts')]], 'required': [['type', 'not in', ('print','multiparts')]]}"/>
+                                <field name="qty_pcs_box" attrs="{'invisible': [['type', 'in', ('print','barcoding','multiparts')]], 'required': [['type', 'not in', ('print','barcoding','multiparts')]]}"/>
                             </group>
                         </group>
                         <notebook>
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 9f0e1e8a..37df16ff 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -11,11 +11,12 @@
                 <field name="partner_ids" widget="many2many_tags"/>
                 <field name="commision_percent"/>
                 <field name="commision_amt" readonly="1"/>
-                <field name="status" readonly="1" decoration-success="status == 'approved'" widget="badge" optional="show"/>
+                <field name="status" readonly="1" decoration-success="status == 'approved'" widget="badge"
+                       optional="show"/>
                 <field name="payment_status" readonly="1"
-                    decoration-success="payment_status == 'payment'"
-                    decoration-danger="payment_status == 'pending'"
-                    widget="badge"/>
+                       decoration-success="payment_status == 'payment'"
+                       decoration-danger="payment_status == 'pending'"
+                       widget="badge"/>
                 <field name="brand_ids" widget="many2many_tags"/>
                 <field name="grouped_so_number" readonly="1" optional="hide"/>
                 <field name="grouped_invoice_number" readonly="1" optional="hide"/>
@@ -47,89 +48,89 @@
         <field name="model">customer.commision</field>
         <field name="arch" type="xml">
             <form>
-<!--                    attrs="{'invisible': [('status', 'in', ['draft','pengajuan1','pengajuan2','pengajuan3','pengajuan4'])]}"-->
+                <!--                    attrs="{'invisible': [('status', 'in', ['draft','pengajuan1','pengajuan2','pengajuan3','pengajuan4'])]}"-->
                 <header>
                     <button name="action_confirm_customer_commision"
-                    string="Confirm" type="object"
-                    attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
-                    options="{}"/>
+                            string="Confirm" type="object"
+                            attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
+                            options="{}"/>
                     <button name="action_reject"
-                        string="Reject"
-                        attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
-                        type="object"/>
-                <button name="button_draft"
-                        string="Reset to Draft"
-                        attrs="{'invisible': [('status', '!=', 'reject')]}"
-                        type="object"/>
+                            string="Reject"
+                            attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
+                            type="object"/>
+                    <button name="button_draft"
+                            string="Reset to Draft"
+                            attrs="{'invisible': [('status', '!=', 'reject')]}"
+                            type="object"/>
                     <button name="action_confirm_customer_payment"
-                        string="Konfirmasi Pembayaran" type="object"
-                        options="{}"
-                        attrs="{'invisible': [('payment_status', '==', 'payment')], 'readonly': [('payment_status', '=', 'payment')]}"/>
+                            string="Konfirmasi Pembayaran" type="object"
+                            options="{}"
+                            attrs="{'invisible': [('payment_status', '==', 'payment')], 'readonly': [('payment_status', '=', 'payment')]}"/>
                     <field name="status" widget="statusbar"
-                       statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,pengajuan4,approved"
-                    statusbar_colors='{"reject":"red"}'/>
+                           statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,pengajuan4,approved"
+                           statusbar_colors='{"reject":"red"}'/>
                 </header>
                 <sheet string="Customer Commision">
-                        <div class="oe_button_box" name="button_box"/>
+                    <div class="oe_button_box" name="button_box"/>
+                    <group>
                         <group>
+                            <field name="number"/>
+                            <field name="date_from"/>
+                            <field name="partner_ids" widget="many2many_tags"/>
+                            <field name="description"/>
+                            <field name="commision_percent"/>
+                            <field name="commision_amt"/>
+                            <field name="commision_amt_text"/>
+                            <field name="grouped_so_number" readonly="1"/>
+                            <field name="grouped_invoice_number" readonly="1"/>
+                            <field name="approved_by" readonly="1"/>
+                        </group>
+                        <group>
+                            <div>
+                                <button name="generate_customer_commision"
+                                        string="Generate Line"
+                                        type="object"
+                                        class="mr-2 oe_highlight"
+                                />
+                            </div>
+                            <field name="date_to"/>
+                            <field name="sales_id"/>
+                            <field name="commision_type"/>
+                            <field name="brand_ids" widget="many2many_tags"/>
+                            <field name="notification" readonly="1"/>
+                            <!--                                <field name="status" readonly="1"/>-->
+                            <field name="payment_status" readonly="1"/>
+                            <field name="total_dpp"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Lines">
+                            <field name="commision_lines"/>
+                        </page>
+                        <page string="Other Info" name="customer_commision_info">
                             <group>
-                                <field name="number"/>
-                                <field name="date_from"/>
-                                <field name="partner_ids" widget="many2many_tags"/>
-                                <field name="description"/>
-                                <field name="commision_percent"/>
-                                <field name="commision_amt"/>
-                                <field name="commision_amt_text"/>
-                                <field name="grouped_so_number" readonly="1"/>
-                                <field name="grouped_invoice_number" readonly="1"/>
-                                <field name="approved_by" readonly="1"/>
+                                <field name="bank_name"/>
+                                <field name="account_name"/>
+                                <field name="bank_account"/>
+                                <field name="note_transfer"/>
                             </group>
+                        </page>
+                        <page string="Finance Notes">
                             <group>
-                                <div>
-                                <button name="generate_customer_commision"
-                                    string="Generate Line"
-                                    type="object"
-                                    class="mr-2 oe_highlight"
-                                />
-                                </div>
-                                <field name="date_to"/>
-                                <field name="sales_id"/>
-                                <field name="commision_type"/>
-                                <field name="brand_ids" widget="many2many_tags"/>
-                                <field name="notification" readonly="1"/>
-<!--                                <field name="status" readonly="1"/>-->
-                                <field name="payment_status" readonly="1" />
-                                <field name="total_dpp"/>
+                                <field name="note_finnance"/>
                             </group>
-                        </group>
-                        <notebook>
-                            <page string="Lines">
-                                <field name="commision_lines"/>
-                            </page>
-                            <page string="Other Info" name="customer_commision_info">
-                                <group>
-                                    <field name="bank_name"/>
-                                    <field name="account_name"/>
-                                    <field name="bank_account"/>
-                                    <field name="note_transfer"/>
-                                </group>
-                            </page>
-                            <page string="Finance Notes">
-                                <group>
-                                    <field name="note_finnance"/>
-                                </group>
-                            </page>
-                        </notebook>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
             </form>
         </field>
     </record>
 
-        <!-- Wizard for Reject Reason -->
+    <!-- Wizard for Reject Reason -->
     <record id="view_reject_reason_wizard_form" model="ir.ui.view">
         <field name="name">reject.reason.commision.form</field>
         <field name="model">reject.reason.commision</field>
@@ -160,7 +161,12 @@
         <field name="arch" type="xml">
             <search string="Search Customer Commision">
                 <field name="partner_ids"/>
-           </search>
+                <group expand="0" string="Group By">
+                    <filter string="Partner" name="group_partner"
+                            domain="[]"
+                            context="{'group_by':'partner_ids'}"/>
+                </group>
+            </search>
         </field>
     </record>
 
@@ -173,17 +179,17 @@
     </record>
 
     <menuitem id="menu_customer_commision_acct"
-        name="Customer Commision"
-        action="customer_commision_action"
-        parent="account.menu_finance_entries"
-        sequence="113"
+              name="Customer Commision"
+              action="customer_commision_action"
+              parent="account.menu_finance_entries"
+              sequence="113"
     />
 
     <menuitem id="menu_customer_commision_sales"
-        name="Customer Commision"
-        action="customer_commision_action"
-        parent="sale.product_menu_catalog"
-        sequence="101"
+              name="Customer Commision"
+              action="customer_commision_action"
+              parent="sale.product_menu_catalog"
+              sequence="101"
     />
 
     <record id="customer_rebate_tree" model="ir.ui.view">
@@ -217,34 +223,34 @@
         <field name="arch" type="xml">
             <form>
                 <sheet string="Customer Rebate">
-                        <div class="oe_button_box" name="button_box"/>
+                    <div class="oe_button_box" name="button_box"/>
+                    <group>
                         <group>
-                            <group>
-                                <field name="date_from"/>
-                                <field name="partner_id"/>
-                                <field name="target_1st"/>
-                                <field name="target_2nd"/>
-                                <field name="dpp_q1"/>
-                                <field name="dpp_q2"/>
-                                <field name="dpp_q3"/>
-                                <field name="dpp_q4"/>
-                            </group>
-                            <group>
-                                <field name="date_to"/>
-                                <field name="description"/>
-                                <field name="achieve_1"/>
-                                <field name="achieve_2"/>
-                                <field name="status_q1"/>
-                                <field name="status_q2"/>
-                                <field name="status_q3"/>
-                                <field name="status_q4"/>
-                            </group>
+                            <field name="date_from"/>
+                            <field name="partner_id"/>
+                            <field name="target_1st"/>
+                            <field name="target_2nd"/>
+                            <field name="dpp_q1"/>
+                            <field name="dpp_q2"/>
+                            <field name="dpp_q3"/>
+                            <field name="dpp_q4"/>
+                        </group>
+                        <group>
+                            <field name="date_to"/>
+                            <field name="description"/>
+                            <field name="achieve_1"/>
+                            <field name="achieve_2"/>
+                            <field name="status_q1"/>
+                            <field name="status_q2"/>
+                            <field name="status_q3"/>
+                            <field name="status_q4"/>
                         </group>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
+                    </group>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
             </form>
         </field>
     </record>
@@ -257,16 +263,16 @@
     </record>
 
     <menuitem id="menu_customer_rebate_acct"
-                name="Customer Rebate"
-                action="customer_rebate_action"
-                parent="account.menu_finance_entries"
-                sequence="114"
+              name="Customer Rebate"
+              action="customer_rebate_action"
+              parent="account.menu_finance_entries"
+              sequence="114"
     />
 
     <menuitem id="menu_customer_rebate_sales"
-        name="Customer Rebate"
-        action="customer_rebate_action"
-        parent="sale.product_menu_catalog"
-        sequence="102"
+              name="Customer Rebate"
+              action="customer_rebate_action"
+              parent="sale.product_menu_catalog"
+              sequence="102"
     />
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 9f980751..97bf40bb 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -65,7 +65,7 @@
             <field name="name">Shipment Group</field>
             <field name="code">shipment.group</field>
             <field name="active">TRUE</field>
-            <field name="prefix">SG/%(year)s/</field>
+            <field name="prefix">SGR/%(year)s/</field>
             <field name="padding">5</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
diff --git a/indoteknik_custom/views/product_product.xml b/indoteknik_custom/views/product_product.xml
index b214dc87..1d04e708 100644
--- a/indoteknik_custom/views/product_product.xml
+++ b/indoteknik_custom/views/product_product.xml
@@ -15,6 +15,7 @@
                     <field name="qty_onhand_bandengan" optional="hide"/>
                     <field name="qty_incoming_bandengan" optional="hide"/>
                     <field name="qty_outgoing_bandengan" optional="hide"/>
+                    <field name="qty_outgoing_mo_bandengan" optional="hide"/>
                     <field name="qty_available_bandengan" optional="hide"/>
                     <field name="qty_free_bandengan" optional="hide"/>
                     <field name="qty_rpo" optional="hide"/>
diff --git a/indoteknik_custom/views/project_views.xml b/indoteknik_custom/views/project_views.xml
new file mode 100644
index 00000000..3023fa18
--- /dev/null
+++ b/indoteknik_custom/views/project_views.xml
@@ -0,0 +1,13 @@
+<odoo>
+    <record id="view_task_kanban_inherit" model="ir.ui.view">
+        <field name="name">project.task.kanban.inherit</field>
+        <field name="model">project.task</field>
+        <field name="inherit_id" ref="project.view_task_kanban"/>
+        <field name="arch" type="xml">
+            <!-- Target field user_id di bagian kanban_bottom_right -->
+            <xpath expr="//div[@class='oe_kanban_bottom_right']/field[@name='user_id']" position="attributes">
+                <attribute name="widget" remove="many2one_avatar_user" />
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 920268bc..0fbbb5e7 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -36,7 +36,6 @@
                 </button>
                 <button name="button_unlock" position="after">
                     <button name="create_bill_pelunasan" string="Create Bill Pelunasan" type="object" class="oe_highlight" attrs="{'invisible': [('state', 'not in', ('purchase', 'done')), ('bills_pelunasan_id', '!=', False)]}"/>
-
                 </button>
                 <field name="date_order" position="before">
                     <field name="sale_order_id" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
@@ -308,6 +307,7 @@
                     <field name="margin_item" optional="hide"/>
                     <field name="delivery_amt" optional="hide"/>
                     <field name="margin_deduct" optional="hide"/>
+                    <field name="hold_outgoing_so" optional="hide"/>
                     <field name="margin_so"/>
                 </tree>
             </field>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 10c60e24..a599a7b8 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -4,211 +4,227 @@
         <record id="sale_order_form_view_inherit" model="ir.ui.view">
             <field name="name">Sale Order</field>
             <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale.view_order_form" />
+            <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <button id="action_confirm" position="after">
                     <button name="calculate_line_no"
-                        string="Create No"
-                        type="object"
+                            string="Create No"
+                            type="object"
                     />
                     <button name="sale_order_approve"
-                        string="Ask Approval"
-                        type="object"
-                        attrs="{'invisible': [('approval_status', '=', ['approved'])]}"
+                            string="Ask Approval"
+                            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')]}"
+                            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')]}" />
+                            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="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)]}" />
+                           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" />
+                           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" />
+                               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)]}"
+                                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'])]}"
+                                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" />
+                    <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" />
+                               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)]}"
+                                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'])]}"
+                                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"
-                        string="Calculate Selling Price"
-                        type="object"
+                            string="Calculate Selling Price"
+                            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="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="flash_sale" />
-                    <field name="margin_after_delivery_purchase" />
-                    <field name="percent_margin_after_delivery_purchase" />
-                    <field name="total_weight" />
-                    <field name="pareto_status" />
+                    <field name="eta_date_start"/>
+                    <t t-esc="' to '"/>
+                    <field name="eta_date" readonly="1"/>
+                    <field name="expected_ready_to_ship"/>
+                    <field name="flash_sale"/>
+                    <field name="margin_after_delivery_purchase"/>
+                    <field name="percent_margin_after_delivery_purchase"/>
+                    <field name="total_weight"/>
+                    <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="email" required="1" />
-                    <field name="unreserve_id" />
-                    <field name="due_id" readonly="1" />
-                    <field name="vendor_approval_id" readonly="1" widget="many2many_tags" />
-                    <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" required="1" />
+                    <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"/>
+                    <field name="vendor_approval_id" readonly="1" widget="many2many_tags"/>
+                    <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" required="1"/>
                     <button name="override_allow_create_invoice"
-                        string="Override Create Invoice"
-                        type="object"
+                            string="Override Create Invoice"
+                            type="object"
                     />
-                    <button string="Estimate Shipping" type="object" name="action_estimate_shipping" />
+                    <button string="Estimate Shipping" type="object" name="action_estimate_shipping"/>
                 </field>
                 <field name="partner_shipping_id" position="after">
-                    <field name="real_shipping_id" />
-                    <field name="real_invoice_id" />
-                    <field name="approval_status" />
+                    <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="carrier_id" required="1" />
-                    <field name="delivery_service_type" readonly="1" />
-                    <field name="shipping_option_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"/>
                 </field>
                 <field name="medium_id" position="after">
-                    <field name="date_doc_kirim" readonly="1" />
-                    <field name="notification" readonly="1" />
+                    <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">
+                       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">
-                    <field name="desc_updatable" invisible="1" />
+                       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">
+                        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">
+                        expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']"
+                        position="attributes">
                     <attribute name="attrs">
                         {
-                        'readonly': [
-                        '|',
-                        ('qty_invoiced', '>', 0),
-                        ('parent.approval_status', '!=', False)
-                        ]
+                            'readonly': [
+                                '|',
+                                ('qty_invoiced', '>', 0),
+                                ('parent.approval_status', '!=', False)
+                            ]
                         }
                     </attribute>
                 </xpath>
                 <div name="invoice_lines" position="before">
                     <div name="vendor_id" groups="base.group_no_one"
-                        attrs="{'invisible': [('display_type', '!=', False)]}">
-                        <label for="vendor_id" />
+                         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" />
+                                   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)]}">
-                        <label for="purchase_price" />
-                        <field name="purchase_price" />
+                         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)]}">
-                        <label for="purchase_tax_id" />
+                         attrs="{'invisible': [('display_type', '!=', False)]}">
+                        <label for="purchase_tax_id"/>
                         <div name="purchase_tax_id">
-                            <field name="purchase_tax_id" />
+                            <field name="purchase_tax_id"/>
                         </div>
                     </div>
                 </div>
                 <div name="invoice_lines" position="before">
                     <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" />
+                         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)]}">
-                        <label for="price_subtotal" />
-                        <field name="price_subtotal" />
+                         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">
-                    <field name="qty_free_bu" optional="hide" />
+                        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_md_id" optional="hide" />
+                           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="
+                           attrs="
                         {
                             'readonly': [
                                 '|',
@@ -216,35 +232,35 @@
                                 ('parent.approval_status', '!=', False)
                             ]
                         }
-                    " />
-                    <field name="purchase_price_md" optional="hide" />
+                    "/>
+                    <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="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="amount_voucher_disc" string="Voucher" readonly="1" optional="hide" />
-                    <field name="order_promotion_id" string="Promotion" readonly="1" optional="hide" />
+                           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="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">
-                    <field name="line_no" readonly="1" optional="hide" />
+                        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">
-                    <field name="qty_reserved" invisible="1" />
-                    <field name="reserved_from" readonly="1" optional="hide" />
+                        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">
+                        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
@@ -253,35 +269,42 @@
                     <attribute name="required">1</attribute>
                 </xpath> -->
                 <field name="amount_total" position="after">
-                    <field name="grand_total" />
-                    <label for="amount_voucher_disc" string="Voucher" />
+                    <field name="grand_total"/>
+                    <label for="amount_voucher_disc" string="Voucher"/>
                     <div>
-                        <field class="mb-0" name="amount_voucher_disc" string="Voucher" readonly="1" />
+                        <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" />
+                               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_margin"/>
+                    <field name="total_percent_margin"/>
+                    <field name="total_before_margin"/>
                 </field>
                 <field name="effective_date" position="after">
-                    <field name="carrier_id" />
-                    <field name="estimated_arrival_days" />
-                    <field name="picking_iu_id" />
-                    <field name="note_ekspedisi" />
+                    <field name="carrier_id"/>
+                    <field name="estimated_arrival_days"/>
+                    <field name="picking_iu_id"/>
+                    <field name="note_ekspedisi"/>
                 </field>
                 <field name="carrier_id" position="attributes">
                     <attribute name="attrs">
                         {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
-                        ['cancel','draft'])]}
+                                                                             ['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>
 
@@ -289,55 +312,55 @@
                     <page string="Website" name="customer_purchase_order">
                         <group>
                             <group>
-                                <field name="partner_purchase_order_name" readonly="True" />
-                                <field name="partner_purchase_order_description" readonly="True" />
-                                <field name="partner_purchase_order_file" readonly="True" />
-                                <field name="note_website" readonly="True" />
-                                <field name="web_approval" readonly="True" />
+                                <field name="partner_purchase_order_name" readonly="True"/>
+                                <field name="partner_purchase_order_description" readonly="True"/>
+                                <field name="partner_purchase_order_file" readonly="True"/>
+                                <field name="note_website" readonly="True"/>
+                                <field name="web_approval" readonly="True"/>
                             </group>
                             <group>
                                 <button name="generate_payment_link_midtrans_sales_order"
-                                    string="Create Payment Link"
-                                    type="object"
+                                        string="Create Payment Link"
+                                        type="object"
                                 />
-                                <field name="payment_link_midtrans" readonly="True" widget="url" />
-                                <field name="gross_amount" readonly="True" />
-                                <field name="payment_type" readonly="True" />
-                                <field name="payment_status" readonly="True" />
-                                <field name="payment_qr_code" widget="image" readonly="True" />
+                                <field name="payment_link_midtrans" readonly="True" widget="url"/>
+                                <field name="gross_amount" readonly="True"/>
+                                <field name="payment_type" readonly="True"/>
+                                <field name="payment_status" readonly="True"/>
+                                <field name="payment_qr_code" widget="image" readonly="True"/>
                             </group>
                         </group>
                     </page>
                     <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>
                     </page>
                     <page string="Matches PO" name="page_matches_po" invisible="1">
-                        <field name="order_sales_match_line" readonly="1" />
+                        <field name="order_sales_match_line" readonly="1"/>
                     </page>
                     <!-- <page string="Fullfillment" name="page_sale_order_fullfillment">
                         <field name="fullfillment_line" readonly="1"/>
                     </page> -->
                     <page string="Fulfillment v2" name="page_sale_order_fullfillment2">
-                        <field name="fulfillment_line_v2" readonly="1" />
+                        <field name="fulfillment_line_v2" readonly="1"/>
                     </page>
                     <page string="Reject Line" name="page_sale_order_reject_line">
-                        <field name="reject_line" readonly="0" />
+                        <field name="reject_line" readonly="0"/>
                     </page>
                     <page string="Koli" name="page_sales_order_koli_line">
-                        <field name="koli_lines" readonly="1" />
+                        <field name="koli_lines" readonly="1"/>
                     </page>
                 </page>
             </field>
@@ -349,15 +372,15 @@
             <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="reason_cancel" widget="selection"/>
+                        <field name="attachment_bukti" widget="many2many_binary" required="1"/>
                         <field name="nomor_so_pengganti"
-                            attrs="{'invisible': [('reason_cancel', '!=', 'ganti_quotation')]}" />
+                               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" />
+                                class="btn-primary"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel"/>
                     </footer>
                 </form>
             </field>
@@ -374,42 +397,44 @@
         <record id="sale_order_tree_view_inherit" model="ir.ui.view">
             <field name="name">Sale Order</field>
             <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale.view_quotation_tree_with_onboarding" />
+            <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="client_order_ref" />
-                    <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="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>
         <record id="sales_order_tree_view_inherit" model="ir.ui.view">
             <field name="name">Sale Order</field>
             <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale.view_order_tree" />
+            <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="client_order_ref" />
-                    <field name="so_status" />
-                    <field name="date_status_done" />
-                    <field name="date_kirim_ril" />
-                    <field name="date_driver_departure" />
-                    <field name="date_driver_arrival" />
-                    <field name="payment_type" optional="hide" />
-                    <field name="payment_status" optional="hide" />
-                    <field name="pareto_status" optional="hide" />
+                    <field name="approval_status"/>
+                    <field name="client_order_ref"/>
+                    <field name="so_status"/>
+                    <field name="date_status_done"/>
+                    <field name="date_kirim_ril"/>
+                    <field name="date_driver_departure"/>
+                    <field name="date_driver_arrival"/>
+                    <field name="payment_type" optional="hide"/>
+                    <field name="payment_status" optional="hide"/>
+                    <field name="pareto_status" optional="hide"/>
                 </field>
             </field>
         </record>
 
         <record id="sale_order_multi_update_ir_actions_server" model="ir.actions.server">
             <field name="name">Mark As Cancel</field>
-            <field name="model_id" ref="sale.model_sale_order" />
-            <field name="binding_model_id" ref="sale.model_sale_order" />
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="binding_model_id" ref="sale.model_sale_order"/>
             <field name="binding_view_types">form,list</field>
             <field name="state">code</field>
             <field name="code">action = records.open_form_multi_update_state()</field>
@@ -417,32 +442,32 @@
 
         <record id="sale_order_update_multi_actions_server" model="ir.actions.server">
             <field name="name">Mark As Completed</field>
-            <field name="model_id" ref="sale.model_sale_order" />
-            <field name="binding_model_id" ref="sale.model_sale_order" />
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="binding_model_id" ref="sale.model_sale_order"/>
             <field name="state">code</field>
             <field name="code">action = records.open_form_multi_update_status()</field>
         </record>
 
         <record id="mail_template_sale_order_web_approve_notification" model="mail.template">
             <field name="name">Sale Order: Web Approve Notification</field>
-            <field name="model_id" ref="indoteknik_custom.model_sale_order" />
+            <field name="model_id" ref="indoteknik_custom.model_sale_order"/>
             <field name="subject">Permintaan Persetujuan Pesanan ${object.name} di Indoteknik.com</field>
             <field name="email_from">sales@indoteknik.com</field>
             <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;">
+                       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;">
+                                   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;">
+                                                   width="590"
+                                                   style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
                                                 <tr>
                                                     <td style="padding-bottom: 24px;">
                                                         Dear
@@ -459,8 +484,8 @@
                                                 <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;">
+                                                                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>
@@ -503,11 +528,11 @@
             <field name="model">sales.order.purchase.match</field>
             <field name="arch" type="xml">
                 <tree editable="top" create="false" delete="false">
-                    <field name="purchase_order_id" readonly="1" />
-                    <field name="purchase_line_id" readonly="1" />
-                    <field name="product_id" readonly="1" />
-                    <field name="qty_so" readonly="1" />
-                    <field name="qty_po" readonly="1" />
+                    <field name="purchase_order_id" readonly="1"/>
+                    <field name="purchase_line_id" readonly="1"/>
+                    <field name="product_id" readonly="1"/>
+                    <field name="qty_so" readonly="1"/>
+                    <field name="qty_po" readonly="1"/>
                 </tree>
             </field>
         </record>
@@ -519,9 +544,9 @@
             <field name="model">sales.order.koli</field>
             <field name="arch" type="xml">
                 <tree editable="top" create="false" delete="false">
-                    <field name="koli_id" readonly="1" />
-                    <field name="picking_id" readonly="1" />
-                    <field name="state" readonly="1" />
+                    <field name="koli_id" readonly="1"/>
+                    <field name="picking_id" readonly="1"/>
+                    <field name="state" readonly="1"/>
                 </tree>
             </field>
         </record>
@@ -535,14 +560,14 @@
         <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" />
+                <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>
@@ -552,10 +577,10 @@
             <field name="model">sales.order.fullfillment</field>
             <field name="arch" type="xml">
                 <tree editable="top" create="false">
-                    <field name="product_id" readonly="1" />
-                    <field name="reserved_from" readonly="1" />
-                    <field name="qty_fullfillment" readonly="1" />
-                    <field name="user_id" readonly="1" />
+                    <field name="product_id" readonly="1"/>
+                    <field name="reserved_from" readonly="1"/>
+                    <field name="qty_fullfillment" readonly="1"/>
+                    <field name="user_id" readonly="1"/>
                 </tree>
             </field>
         </record>
@@ -567,9 +592,9 @@
             <field name="model">sales.order.reject</field>
             <field name="arch" type="xml">
                 <tree editable="top" create="false">
-                    <field name="product_id" readonly="1" />
-                    <field name="qty_reject" readonly="1" />
-                    <field name="reason_reject" readonly="0" />
+                    <field name="product_id" readonly="1"/>
+                    <field name="qty_reject" readonly="1"/>
+                    <field name="reason_reject" readonly="0"/>
                 </tree>
             </field>
         </record>
@@ -578,8 +603,8 @@
     <data>
         <record id="sale_order_multi_create_uangmuka_ir_actions_server" model="ir.actions.server">
             <field name="name">Uang Muka</field>
-            <field name="model_id" ref="sale.model_sale_order" />
-            <field name="binding_model_id" ref="sale.model_sale_order" />
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="binding_model_id" ref="sale.model_sale_order"/>
             <field name="state">code</field>
             <field name="code">action = records.open_form_multi_create_uang_muka()</field>
         </record>
@@ -588,24 +613,24 @@
     <data>
         <record id="mail_template_sale_order_notification_to_salesperson" model="mail.template">
             <field name="name">Sale Order: Notification to Salesperson</field>
-            <field name="model_id" ref="sale.model_sale_order" />
+            <field name="model_id" ref="sale.model_sale_order"/>
             <field name="subject">Konsolidasi Pengiriman</field>
             <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;">
+                       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;">
+                                   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;">
+                                                   width="590"
+                                                   style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
                                                 <tr>
                                                     <td valign="middle">
                                                         <span></span>
@@ -618,8 +643,8 @@
                                     <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;">
+                                                   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>
@@ -636,7 +661,7 @@
                                                 <tr>
                                                     <td>
                                                         <table border="1" cellpadding="5"
-                                                            cellspacing="0">
+                                                               cellspacing="0">
                                                             <thead>
                                                                 <tr>
                                                                     <th>Nama Pesanan</th>
@@ -655,7 +680,7 @@
                                                 <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;" />
+                                                            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>
diff --git a/indoteknik_custom/views/shipment_group.xml b/indoteknik_custom/views/shipment_group.xml
index e9eec41b..a4f82e27 100644
--- a/indoteknik_custom/views/shipment_group.xml
+++ b/indoteknik_custom/views/shipment_group.xml
@@ -7,6 +7,8 @@
             <tree default_order="create_date desc">
                 <field name="number"/>
                 <field name="partner_id"/>
+                <field name="carrier_id"/>
+                <field name="total_colly_line"/>
             </tree>
         </field>
     </record>
@@ -16,11 +18,10 @@
         <field name="model">shipment.group.line</field>
         <field name="arch" type="xml">
             <tree editable="bottom">
-                <field name="picking_id" required="1"/>
                 <field name="partner_id" readonly="1"/>
+                <field name="picking_id" required="1"/>
                 <field name="sale_id" readonly="1"/>
-                <field name="shipping_paid_by" readonly="1"/>
-                <field name="state" readonly="1"/>
+                <field name="total_colly" readonly="1"/>
             </tree>
         </field>
     </record>
@@ -37,6 +38,8 @@
                         </group>
                         <group>
                             <field name="partner_id" readonly="1"/> 
+                            <field name="carrier_id" readonly="1"/> 
+                            <field name="total_colly_line" readonly="1"/> 
                         </group>
                     </group>
                     <notebook>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index b45debd0..ae77ab9a 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -73,6 +73,11 @@
                             type="object"
                             attrs="{'invisible': [('carrier_id', '!=', 9)]}"
                     />
+                    <button name="action_get_kgx_pod"
+                            string="Tracking KGX"
+                            type="object"
+                            attrs="{'invisible': [('carrier_id', '!=', 173)]}"
+                    />
                     <button name="button_state_approve_md"
                             string="Approve MD Gudang Selisih"
                             type="object"
@@ -219,6 +224,13 @@
                                 <field name="lalamove_image_url" invisible="1"/>
                                 <field name="lalamove_image_html"/>
                             </group>
+                            <group attrs="{'invisible': [('carrier_id', '!=', 173)]}">
+                                <field name="kgx_pod_photo_url" invisible="1"/>
+                                <field name="kgx_pod_photo"/>
+                                <field name="kgx_pod_signature" invisible="1"/>
+                                <field name="kgx_pod_receive_time"/>
+                                <field name="kgx_pod_receiver"/>
+                            </group>
                         </group>
                     </page>
                     <page string="Check Product" name="check_product" attrs="{'invisible': [('picking_type_code', '=', 'outgoing')]}">
diff --git a/indoteknik_custom/views/user_pengajuan_tempo_request.xml b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
index 339ce8db..898d5b2a 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo_request.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
@@ -426,7 +426,7 @@
     <menuitem
         id="menu_user_pengajuan_tempo_request"
         name="User Pengajuan Tempo Request"
-        parent="res_partner_menu_user"
+        parent="account.menu_finance_receivables"
         sequence="3"
         action="action_user_pengajuan_tempo_request"
     />
diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml
index ae958f05..78e42969 100755
--- a/indoteknik_custom/views/voucher.xml
+++ b/indoteknik_custom/views/voucher.xml
@@ -27,63 +27,71 @@
                         <group>
                             <group>
                                 <field name="image" widget="image" width="120"/>
-                                <field name="name" required="1" />
-                                <field name="code" required="1" />
-                                <field name="visibility" required="1" />
+                                <field name="name" required="1"/>
+                                <field name="code" required="1"/>
+                                <field name="voucher_category" widget="many2many"/>
+                                <field name="visibility" required="1"/>
                                 <field name="start_time" required="1"/>
                                 <field name="end_time" required="1"/>
                                 <field name="limit" required="1"/>
                                 <field name="limit_user" required="1"/>
-                                <field name="apply_type" required="1" />
-                                <field name="account_type" required="1" />
-                                <field name="show_on_email" />
-                                <field name="excl_pricelist_ids" widget="many2many_tags" domain="[('id', 'in', [4, 15037, 15038, 15039, 17023, 17024, 17025, 17026,17027])]"/>
+                                <field name="apply_type" required="1"/>
+                                <field name="account_type" required="1"/>
+                                <field name="show_on_email"/>
+                                <field name="excl_pricelist_ids" widget="many2many_tags"
+                                       domain="[('id', 'in', [4, 15037, 15038, 15039, 17023, 17024, 17025, 17026,17027])]"/>
                             </group>
-                            <group string="Discount Settings" attrs="{'invisible': [('apply_type', 'not in', ['all', 'shipping'])]}">
-                                <field name="min_purchase_amount" widget="monetary" required="1" />
-                                <field name="discount_type" attrs="{'invisible': [('apply_type','not in', ['all', 'shipping'])], 'required': [('apply_type', 'in', ['all', 'shipping'])]}" />
+                            <group string="Discount Settings"
+                                   attrs="{'invisible': [('apply_type', 'not in', ['all', 'shipping'])]}">
+                                <field name="min_purchase_amount" widget="monetary" required="1"/>
+                                <field name="discount_type"
+                                       attrs="{'invisible': [('apply_type','not in', ['all', 'shipping'])], 'required': [('apply_type', 'in', ['all', 'shipping'])]}"/>
 
-                                <label for="max_discount_amount" string="Discount Amount" />
+                                <label for="max_discount_amount" string="Discount Amount"/>
                                 <div class="d-flex align-items-center">
-                                    <span 
-                                        class="mr-1 font-weight-bold" 
-                                        attrs="{'invisible': [('discount_type', '!=', 'fixed_price')]}"
+                                    <span
+                                            class="mr-1 font-weight-bold"
+                                            attrs="{'invisible': [('discount_type', '!=', 'fixed_price')]}"
                                     >
                                         Rp
                                     </span>
-                                    <field class="mb-0" name="discount_amount" required="1" />
-                                    <span 
-                                        class="ml-1 font-weight-bold" 
-                                        attrs="{'invisible': [('discount_type', '!=', 'percentage')]}"
+                                    <field class="mb-0" name="discount_amount" required="1"/>
+                                    <span
+                                            class="ml-1 font-weight-bold"
+                                            attrs="{'invisible': [('discount_type', '!=', 'percentage')]}"
                                     >
                                         %
                                     </span>
                                 </div>
 
-                                <field name="max_discount_amount" widget="monetary" required="1" attrs="{'invisible': [('discount_type', '!=', 'percentage')]}"/>
+                                <field name="max_discount_amount" widget="monetary" required="1"
+                                       attrs="{'invisible': [('discount_type', '!=', 'percentage')]}"/>
                             </group>
                         </group>
                         <notebook>
-                            <page name="voucher_line" string="Voucher Line" attrs="{'invisible': [('apply_type', '!=', 'brand')]}">
+                            <page name="voucher_line" string="Voucher Line"
+                                  attrs="{'invisible': [('apply_type', '!=', 'brand')]}">
                                 <field name="voucher_line">
                                     <tree editable="bottom">
-                                        <field name="manufacture_id" required="1" />
-                                        <field name="min_purchase_amount" required="1" />
-                                        <field name="discount_type" required="1" />
-                                        <field name="discount_amount" required="1" />
-                                        <field name="max_discount_amount" required="1" attrs="{'readonly': [('discount_type', '!=', 'percentage')]}" />
+                                        <field name="manufacture_id" required="1"/>
+                                        <field name="min_purchase_amount" required="1"/>
+                                        <field name="discount_type" required="1"/>
+                                        <field name="discount_amount" required="1"/>
+                                        <field name="max_discount_amount" required="1"
+                                               attrs="{'readonly': [('discount_type', '!=', 'percentage')]}"/>
                                     </tree>
                                 </field>
                             </page>
                             <page name="description" string="Description">
-                                <label for="description" string="Max 120 characters:" class="font-weight-normal mb-2 oe_edit_only"/>
-                                <field name="description" placeholder="Insert short description..." />
+                                <label for="description" string="Max 120 characters:"
+                                       class="font-weight-normal mb-2 oe_edit_only"/>
+                                <field name="description" placeholder="Insert short description..."/>
                             </page>
                             <page name="terms_conditions" string="Terms and Conditions">
-                                <field name="terms_conditions" />
+                                <field name="terms_conditions"/>
                             </page>
                             <page name="order_page" string="Orders">
-                                <field name="order_ids" readonly="1" />
+                                <field name="order_ids" readonly="1"/>
                             </page>
                         </notebook>
                     </sheet>
@@ -92,10 +100,10 @@
         </record>
 
         <menuitem id="voucher"
-            name="Voucher"
-            parent="website_sale.menu_catalog"
-            sequence="1"
-            action="voucher_action"
+                  name="Voucher"
+                  parent="website_sale.menu_catalog"
+                  sequence="1"
+                  action="voucher_action"
         />
     </data>
 </odoo>
\ No newline at end of file