From 9bd46f112fdfb4fb7f56866b4e260efbd26c6daa Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 17 Feb 2025 08:36:01 +0700
Subject: <iman> renca req tempo status

---
 indoteknik_custom/views/user_pengajuan_tempo_request.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/user_pengajuan_tempo_request.xml b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
index f7ad9afb..7063231b 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo_request.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
@@ -10,7 +10,17 @@
                 <field name="create_date"/>
                 <field name="tempo_duration" attrs="{'readonly': [('state_tempo', '=', 'approval_director')]}"/>
                 <field name="tempo_limit" attrs="{'readonly': [('state_tempo', '=', 'approval_director')]}" placeholder="Contoh format, misalnya '10000000'" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                <field name="state_tempo" decoration-success="state_tempo == 'approval_director'" decoration-danger="state_tempo == 'reject'" widget="badge" optional="show"/>
+<!--                <field name="state_tempo"-->
+<!--                    decoration-danger="state_tempo == 'reject'"-->
+<!--                    decoration-warning="state_tempo in ('draft', 'approval_sales', 'approval_finance')"-->
+<!--                    decoration-success="state_tempo == 'approval_director'">-->
+<!--                    <tree>-->
+<!--                        <field name="state_tempo" invisible="1"/>-->
+<!--                        <field name="state_tempo_text" string="Status"/>-->
+<!--                    </tree>-->
+<!--                </field>-->
+                 <field name="state_tempo" invisible="1"/>
+                <field name="state_tempo_text" decoration-success="state_tempo_text == 'Approved'" decoration-danger="state_tempo_text == 'Rejected'" widget="badge" optional="show"/>
             </tree>
         </field>
     </record>
-- 
cgit v1.2.3


From 80c56615d5c605f6e96cc3567a6b3d0332152957 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 18 Feb 2025 13:16:20 +0700
Subject: <iman> CR customer commision

---
 indoteknik_custom/views/customer_commision.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 0b72587e..55736b0d 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -12,6 +12,10 @@
                 <field name="commision_percent"/>
                 <field name="commision_amt" readonly="1"/>
                 <field name="status" readonly="1"/>
+                <field name="payment_status" readonly="1"
+                decoration-success="payment_status == 'payment'"
+                decoration-danger="payment_status == 'pending'"
+                widget="badge"/>
                 <field name="brand_ids" widget="many2many_tags"/>
             </tree>
         </field>
@@ -43,6 +47,10 @@
                     <button name="action_confirm_customer_commision" 
                     string="Confirm" type="object"
                     options="{}"/>
+                    <button name="action_confirm_customer_payment"
+                    string="Konfirmasi Pembayaran" type="object"
+                    options="{}"
+                    attrs="{'invisible': [('status', '!=', 'approved'),]}"/>
                 </header>
                 <sheet string="Customer Commision">
                         <div class="oe_button_box" name="button_box"/>
@@ -68,6 +76,7 @@
                                 <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>
-- 
cgit v1.2.3


From a9abc6b63f1bafb1e007da4446636ec2da10d493 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 18 Feb 2025 13:19:43 +0700
Subject: <iman> back to original before CR customer commision

---
 indoteknik_custom/views/customer_commision.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 55736b0d..0b72587e 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -12,10 +12,6 @@
                 <field name="commision_percent"/>
                 <field name="commision_amt" readonly="1"/>
                 <field name="status" readonly="1"/>
-                <field name="payment_status" readonly="1"
-                decoration-success="payment_status == 'payment'"
-                decoration-danger="payment_status == 'pending'"
-                widget="badge"/>
                 <field name="brand_ids" widget="many2many_tags"/>
             </tree>
         </field>
@@ -47,10 +43,6 @@
                     <button name="action_confirm_customer_commision" 
                     string="Confirm" type="object"
                     options="{}"/>
-                    <button name="action_confirm_customer_payment"
-                    string="Konfirmasi Pembayaran" type="object"
-                    options="{}"
-                    attrs="{'invisible': [('status', '!=', 'approved'),]}"/>
                 </header>
                 <sheet string="Customer Commision">
                         <div class="oe_button_box" name="button_box"/>
@@ -76,7 +68,6 @@
                                 <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>
-- 
cgit v1.2.3