Merge branch 'cr/manzila-commision' into odoo-backup

# Conflicts:
#	indoteknik_custom/models/sale_order.py
#	indoteknik_custom/models/stock_picking.py

2 files changed, 51 insertions, 3 deletions

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index bb1628bc..5df494f3 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -11,7 +11,7 @@
                 <field name="partner_ids" widget="many2many_tags"/>
                 <field name="commision_percent"/>
                 <field name="commision_amt" readonly="1"/>
-                <field name="status" readonly="1"/>
+                <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'"
@@ -30,10 +30,12 @@
             <tree editable="top" create="false">
                 <field name="partner_id" readonly="1"/>
                 <field name="invoice_id" readonly="1"/>
+                <field name="sale_order_id" readonly="1"/>
                 <field name="state" readonly="1"/>
                 <field name="product_id" readonly="1" optional="hide"/>
                 <field name="dpp" readonly="1"/>
                 <field name="total_percent_margin" readonly="1"/>
+                <field name="total_margin_excl_third_party" readonly="1"/>
                 <field name="tax" readonly="1" optional="hide"/>
                 <field name="total" readonly="1" optional="hide"/>
             </tree>
@@ -45,14 +47,27 @@
         <field name="model">customer.commision</field>
         <field name="arch" type="xml">
             <form>
+<!--                    attrs="{'invisible': [('status', 'in', ['draft','pengajuan1','pengajuan2','pengajuan3','pengajuan4'])]}"-->
                 <header>
-                    <button name="action_confirm_customer_commision" 
+                    <button name="action_confirm_customer_commision"
                     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"/>
                     <button name="action_confirm_customer_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"}'/>
                 </header>
                 <sheet string="Customer Commision">
                         <div class="oe_button_box" name="button_box"/>
@@ -64,8 +79,10 @@
                                 <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>
@@ -79,7 +96,7 @@
                                 <field name="commision_type"/>
                                 <field name="brand_ids" widget="many2many_tags"/>
                                 <field name="notification" readonly="1"/>
-                                <field name="status" readonly="1"/>
+<!--                                <field name="status" readonly="1"/>-->
                                 <field name="payment_status" readonly="1" />
                                 <field name="total_dpp"/>
                             </group>
@@ -96,6 +113,11 @@
                                     <field name="note_transfer"/>
                                 </group>
                             </page>
+                            <page string="Finance Notes">
+                                <group>
+                                    <field name="note_finnance"/>
+                                </group>
+                            </page>
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
@@ -106,6 +128,30 @@
         </field>
     </record>
 
+        <!-- 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>
+        <field name="arch" type="xml">
+            <form string="Reject Reason">
+                <group>
+                    <field name="reason_reject" widget="text"/>
+                </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_reject_reason_wizard" model="ir.actions.act_window">
+        <field name="name">Reject Reason</field>
+        <field name="res_model">reject.reason.commision</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
     <record id="view_customer_commision_filter" model="ir.ui.view">
         <field name="name">customer.commision.list.select</field>
         <field name="model">customer.commision</field>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 0d190f37..74730e06 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -31,7 +31,9 @@
                     <field name="shipping_paid_by" attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-15'), ('create_date', '=', False)]}"/>
                     <field name="delivery_amt"/>
                     <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">