From f4486625017ee5edae369a6be283863a30066b3b Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 18 Jun 2025 10:30:02 +0700
Subject: cashback 15% customer commision

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

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 37df16ff..4be0840f 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -81,6 +81,8 @@
                             <field name="commision_percent"/>
                             <field name="commision_amt"/>
                             <field name="commision_amt_text"/>
+                            <field name="cashback" attrs="{'invisible': [('commision_type', 'not in', ['cashback'])]}"/>
+                            <field name="total_commision" attrs="{'invisible': [('commision_type', 'not in', ['cashback'])]}"/>
                             <field name="grouped_so_number" readonly="1"/>
                             <field name="grouped_invoice_number" readonly="1"/>
                             <field name="approved_by" readonly="1"/>
-- 
cgit v1.2.3


From 6ae8ac2d0a560d850e7e8dc2ce87157f3e5a9669 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Mon, 23 Jun 2025 10:10:51 +0700
Subject: (andri) menu commision customer menjadi commision benefits

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

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 4be0840f..d5fb1d70 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -70,7 +70,7 @@
                            statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,pengajuan4,approved"
                            statusbar_colors='{"reject":"red"}'/>
                 </header>
-                <sheet string="Customer Commision">
+                <sheet string="Customer Benefits">
                     <div class="oe_button_box" name="button_box"/>
                     <group>
                         <group>
@@ -173,7 +173,7 @@
     </record>
 
     <record id="customer_commision_action" model="ir.actions.act_window">
-        <field name="name">Customer Commision</field>
+        <field name="name">Customer Benefits</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">customer.commision</field>
         <field name="search_view_id" ref="view_customer_commision_filter"/>
@@ -181,14 +181,14 @@
     </record>
 
     <menuitem id="menu_customer_commision_acct"
-              name="Customer Commision"
+              name="Customer Benefits"
               action="customer_commision_action"
               parent="account.menu_finance_entries"
               sequence="113"
     />
 
     <menuitem id="menu_customer_commision_sales"
-              name="Customer Commision"
+              name="Customer Benefits"
               action="customer_commision_action"
               parent="sale.product_menu_catalog"
               sequence="101"
-- 
cgit v1.2.3


From 8ca3394604d088a683fc4a3c69321ad65f093b7f Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 25 Jun 2025 11:18:33 +0700
Subject: add terbilang total cashback customer commision

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

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index d5fb1d70..1c17bf63 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -83,6 +83,7 @@
                             <field name="commision_amt_text"/>
                             <field name="cashback" attrs="{'invisible': [('commision_type', 'not in', ['cashback'])]}"/>
                             <field name="total_commision" attrs="{'invisible': [('commision_type', 'not in', ['cashback'])]}"/>
+                            <field name="total_cashback_text" attrs="{'invisible': [('commision_type', 'not in', ['cashback'])]}"/>
                             <field name="grouped_so_number" readonly="1"/>
                             <field name="grouped_invoice_number" readonly="1"/>
                             <field name="approved_by" readonly="1"/>
-- 
cgit v1.2.3


From 8c51dd97b7ddba2059d1b648799844aedd733501 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 14 Jul 2025 11:38:37 +0700
Subject: <miqdad> add biaya lain2 field in customer commision

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

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 1c17bf63..64f1ef76 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -104,6 +104,7 @@
                             <!--                                <field name="status" readonly="1"/>-->
                             <field name="payment_status" readonly="1"/>
                             <field name="total_dpp"/>
+                            <field name="biaya_lain_lain"/>
                         </group>
                     </group>
                     <notebook>
-- 
cgit v1.2.3


From b70acc8a458e9544f672ecc9549eb1fc3606bc35 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 14 Jul 2025 11:45:14 +0700
Subject: <miqdad> add biaya lain2 field in customer commision

---
 indoteknik_custom/views/customer_commision.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indoteknik_custom/views/customer_commision.xml')

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 64f1ef76..514e6284 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -103,8 +103,8 @@
                             <field name="notification" readonly="1"/>
                             <!--                                <field name="status" readonly="1"/>-->
                             <field name="payment_status" readonly="1"/>
-                            <field name="total_dpp"/>
                             <field name="biaya_lain_lain"/>
+                            <field name="total_dpp"/>
                         </group>
                     </group>
                     <notebook>
-- 
cgit v1.2.3