From ff058e22f64cd3e2dbd69d835f68877f530820c3 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Tue, 30 Dec 2025 10:45:15 +0700
Subject: (andri) has magento + sync to mirroring to test

---
 indoteknik_custom/views/product_product.xml  | 1 +
 indoteknik_custom/views/product_template.xml | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/product_product.xml b/indoteknik_custom/views/product_product.xml
index 1d04e708..e8a7380b 100644
--- a/indoteknik_custom/views/product_product.xml
+++ b/indoteknik_custom/views/product_product.xml
@@ -20,6 +20,7 @@
                     <field name="qty_free_bandengan" optional="hide"/>
                     <field name="qty_rpo" optional="hide"/>
                     <field name="plafon_qty" optional="hide"/>
+                    <field name="has_magento" optional="hide"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 1933a5d1..9fbf007a 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -78,6 +78,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="last_update_solr" position="after">
+                    <field name="has_magento"/>
                     <field name="barcode_box" />
                     <field name="qty_pcs_box" />
                     <field name="clean_website_description" />
@@ -114,6 +115,7 @@
                     <field name="solr_flag"/>
                     <field name="x_attribute_set_id"/>
                     <field name="x_attribute_set_name"/>
+                    <!-- <field name="has_magento"/> -->
                 </field>
             </field>
         </record>
@@ -127,6 +129,7 @@
                     <field name="usage"/>
                     <field name="specification"/>
                     <field name="material"/>
+                    <field name="has_magento" />
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3


From 7b7e6e99fa88804a931125b500d02ac23082147c Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Wed, 7 Jan 2026 12:44:00 +0700
Subject: (andri) add cancel PUM reimburse

---
 .../views/advance_payment_request.xml              | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index dd6370c7..5abcf996 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -44,6 +44,11 @@
                             ('is_cab_visible', '=', True), 
                             ('type_request', '!=', 'reimburse')
                         ]}"/>
+                    <button name="action_open_cancel_wizard" 
+                        string="Cancel" 
+                        type="object" 
+                        class="btn-danger" 
+                        attrs="{'invisible': [('status', 'in', ['draft', 'cancel'])]}"/>
                     <field name="status" widget="statusbar"
                         statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,approved"
                         statusbar_colors='{"reject":"red"}'
@@ -316,4 +321,34 @@
         <field name="view_id" ref="view_form_create_reimburse_cab_wizard"/>
         <field name="target">new</field>
     </record>
+
+    <record id="view_advance_payment_cancel_wizard_form" model="ir.ui.view">
+            <field name="name">advance.payment.cancel.wizard.form</field>
+            <field name="model">advance.payment.cancel.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Batalkan Pengajuan">
+                    <sheet>
+                        <group>
+                            <div class="alert alert-warning" role="alert" style="margin-bottom: 10px;">
+                                Apakah Anda yakin ingin membatalkan pengajuan ini? 
+                                Silakan isi alasan pembatalan di bawah ini.
+                            </div>
+                        </group>
+                        <group>
+                            <field name="reason"/>
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="action_confirm_cancel" 
+                                string="Konfirmasi Cancel" 
+                                type="object" 
+                                class="btn-danger"/>
+                        
+                        <button string="Tutup" 
+                                class="btn-secondary" 
+                                special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
 </odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From d4279911c730127209ca4252e80098ce2585536f Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Wed, 7 Jan 2026 12:56:22 +0700
Subject: (andri) off delete pum reimburse

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 5abcf996..c1d83077 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -199,7 +199,7 @@
         <field name="name">advance.payment.request.tree</field>
         <field name="model">advance.payment.request</field>
         <field name="arch" type="xml">
-            <tree>
+            <tree delete="false">
                 <field name="number"/>
                 <field name="applicant_name"/>
                 <field name="nominal"/>
-- 
cgit v1.2.3


From f30d42db7a651b65bb21c1fcc99df9cc2df7196d Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Wed, 7 Jan 2026 13:01:36 +0700
Subject: (andri) off delete di tree dan form

---
 indoteknik_custom/views/advance_payment_request.xml    | 2 +-
 indoteknik_custom/views/advance_payment_settlement.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index c1d83077..b1d20406 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -4,7 +4,7 @@
         <field name="name">advance.payment.request.form</field>
         <field name="model">advance.payment.request</field>
         <field name="arch" type="xml">
-            <form string="Advance Payment Request &amp; Reimburse" duplicate="0">
+            <form string="Advance Payment Request &amp; Reimburse" duplicate="0" delete="false">
                 <header>
                     <button name="action_realisasi_pum"
                         type="object"
diff --git a/indoteknik_custom/views/advance_payment_settlement.xml b/indoteknik_custom/views/advance_payment_settlement.xml
index c2b6a26f..a8bf1de7 100644
--- a/indoteknik_custom/views/advance_payment_settlement.xml
+++ b/indoteknik_custom/views/advance_payment_settlement.xml
@@ -3,7 +3,7 @@
         <field name="name">advance.payment.settlement.form</field>
         <field name="model">advance.payment.settlement</field>
         <field name="arch" type="xml">
-            <form string="Advance Payment Settlement" duplicate="0">
+            <form string="Advance Payment Settlement" duplicate="0" delete="false">
                 <header>
                     <button name="action_cab"
                         type="object"
-- 
cgit v1.2.3


From ba1b0ca10182a734dfa99a52270c95c73e4b8522 Mon Sep 17 00:00:00 2001
From: Mqdd <ahmadmiqdad27@gmail.com>
Date: Tue, 13 Jan 2026 10:01:20 +0700
Subject: <MIqdad> add category description for website

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/product_public_category.xml b/indoteknik_custom/views/product_public_category.xml
index a45e0a2e..c2ee154d 100755
--- a/indoteknik_custom/views/product_public_category.xml
+++ b/indoteknik_custom/views/product_public_category.xml
@@ -22,6 +22,7 @@
                 <field name="image" widget="image"/>
                 <field name="sequence_frontend"/>
                 <field name="parent_frontend_id"/>
+                <field name="short_desc"/>
             </xpath>
             <xpath expr="//form[1]/sheet[1]/div[1]/group[1]" position="after">
                 <notebook>
-- 
cgit v1.2.3


From d2bc81ff4939c6968d4eb06567ec4114133f1140 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Thu, 15 Jan 2026 14:40:12 +0700
Subject: (andri) fix layout status

---
 indoteknik_custom/views/advance_payment_request.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index b1d20406..8bbe6f82 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -56,7 +56,8 @@
                 </header>
                 <sheet>
                     <widget name="web_ribbon" title="Payment" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'payment'), ('status', '=', 'draft')]}"/>
-                    <widget name="web_ribbon" title="Pending" bg_color="bg-danger" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'pending'), ('status', '=', 'draft')]}"/>
+                    <widget name="web_ribbon" title="Pending" bg_color="bg-warning" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'pending'), ('status', '=', 'draft')]}"/>
+                    <widget name="web_ribbon" title="Cancel" bg_color="bg-danger" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'cancel'), ('status', '=', 'draft')]}"/>
                     <div class="oe_button_box" name="button_box" style="right: 150px;">
                         <field name="has_settlement" invisible="1"/>
                         <button name="action_realisasi_pum"
@@ -113,9 +114,10 @@
                             <field name="approved_by" readonly="1"/>
                             <field name="create_date" readonly="1"/>
                             <field name="status_pay_down_payment"
-                                readonly="1"
+                                readonly="1"            
                                 decoration-success="status_pay_down_payment == 'payment'"
-                                decoration-danger="status_pay_down_payment == 'pending'"
+                                decoration-warning="status_pay_down_payment == 'pending'"
+                                decoration-danger="status_pay_down_payment == 'cancel'"
                                 widget="badge" invisible = "1"/>
                         </group>
                         <group string="Bukti Transfer">
@@ -212,7 +214,8 @@
                 <field name="status_pay_down_payment"
                     readonly="1"
                     decoration-success="status_pay_down_payment == 'payment'"
-                    decoration-danger="status_pay_down_payment == 'pending'"
+                    decoration-warning="status_pay_down_payment == 'pending'"
+                    decoration-danger="status_pay_down_payment == 'cancel'"
                     widget="badge"/>
                 <field name="days_remaining" readonly="1" widget="badge" optional="hide"/>
                 <field name="estimated_return_date" widget="badge" optional="hide"/>
-- 
cgit v1.2.3


From e42aee6c9af962edad71603eaaaeceea8589dc7a Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Thu, 15 Jan 2026 16:16:04 +0700
Subject: fix invalid field

---
 indoteknik_custom/views/product_product.xml  | 2 +-
 indoteknik_custom/views/product_template.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/product_product.xml b/indoteknik_custom/views/product_product.xml
index e8a7380b..ee03779f 100644
--- a/indoteknik_custom/views/product_product.xml
+++ b/indoteknik_custom/views/product_product.xml
@@ -20,7 +20,7 @@
                     <field name="qty_free_bandengan" optional="hide"/>
                     <field name="qty_rpo" optional="hide"/>
                     <field name="plafon_qty" optional="hide"/>
-                    <field name="has_magento" optional="hide"/>
+                    <!-- <field name="has_magento" optional="hide"/> -->
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 9fbf007a..06741859 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -78,7 +78,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="last_update_solr" position="after">
-                    <field name="has_magento"/>
+                    <!-- <field name="has_magento"/> -->
                     <field name="barcode_box" />
                     <field name="qty_pcs_box" />
                     <field name="clean_website_description" />
@@ -113,8 +113,8 @@
                     <field name="virtual_rating"/>
                     <field name="search_rank"/>
                     <field name="solr_flag"/>
-                    <field name="x_attribute_set_id"/>
-                    <field name="x_attribute_set_name"/>
+                    <!-- <field name="x_attribute_set_id"/> -->
+                    <!-- <field name="x_attribute_set_name"/> -->
                     <!-- <field name="has_magento"/> -->
                 </field>
             </field>
-- 
cgit v1.2.3


From 4e28776562e9916556a920a6b42ec61f93a2a15f Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Thu, 15 Jan 2026 16:38:24 +0700
Subject: fix

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 06741859..3643c25f 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -129,7 +129,7 @@
                     <field name="usage"/>
                     <field name="specification"/>
                     <field name="material"/>
-                    <field name="has_magento" />
+                    <!-- <field name="has_magento" /> -->
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3


From a571ac15c0cf643542acaf7051ccc8db6976c9d6 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Thu, 15 Jan 2026 19:31:43 +0700
Subject: field has magento & attribute set

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 3643c25f..9fbf007a 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -78,7 +78,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="last_update_solr" position="after">
-                    <!-- <field name="has_magento"/> -->
+                    <field name="has_magento"/>
                     <field name="barcode_box" />
                     <field name="qty_pcs_box" />
                     <field name="clean_website_description" />
@@ -113,8 +113,8 @@
                     <field name="virtual_rating"/>
                     <field name="search_rank"/>
                     <field name="solr_flag"/>
-                    <!-- <field name="x_attribute_set_id"/> -->
-                    <!-- <field name="x_attribute_set_name"/> -->
+                    <field name="x_attribute_set_id"/>
+                    <field name="x_attribute_set_name"/>
                     <!-- <field name="has_magento"/> -->
                 </field>
             </field>
@@ -129,7 +129,7 @@
                     <field name="usage"/>
                     <field name="specification"/>
                     <field name="material"/>
-                    <!-- <field name="has_magento" /> -->
+                    <field name="has_magento" />
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3


From 32d0c433ff990bde6f2839982b935cf809bde29d Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Mon, 19 Jan 2026 14:42:31 +0700
Subject: (andri) hide cancel PUM/reimburse jika pengajuan sudah dibayar

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 8bbe6f82..cac40845 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -48,7 +48,7 @@
                         string="Cancel" 
                         type="object" 
                         class="btn-danger" 
-                        attrs="{'invisible': [('status', 'in', ['draft', 'cancel'])]}"/>
+                        attrs="{'invisible': ['|',('status', 'in', ['draft', 'cancel']), ('status_pay_down_payment', '=', 'payment')]}"/>
                     <field name="status" widget="statusbar"
                         statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,approved"
                         statusbar_colors='{"reject":"red"}'
-- 
cgit v1.2.3


From 7cd24a41b8f0bd3a60b52349dad5b5ea87b44478 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Tue, 20 Jan 2026 10:38:55 +0700
Subject: hide approval pum reimburse when status is cancel

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index cac40845..7f422aa9 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -18,7 +18,7 @@
                         type="object"
                         string="Checking/Approval"
                         class="btn-success"
-                         attrs="{'invisible': [('status', 'in', ['approved','reject','draft'])]}"/>
+                         attrs="{'invisible': [('status', 'in', ['approved','cancel','draft'])]}"/>
                     <button name="action_confirm_payment"
                         type="object"
                         string="Konfirmasi Pembayaran"
-- 
cgit v1.2.3


From 33f01a131c10b7352ade3b52072cfd5b6b2333f0 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Tue, 20 Jan 2026 15:58:07 +0700
Subject: (andri) add note detail pj

---
 indoteknik_custom/views/purchasing_job.xml       | 2 ++
 indoteknik_custom/views/purchasing_job_state.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchasing_job.xml b/indoteknik_custom/views/purchasing_job.xml
index 6b8baa53..d303e5ea 100644
--- a/indoteknik_custom/views/purchasing_job.xml
+++ b/indoteknik_custom/views/purchasing_job.xml
@@ -17,6 +17,7 @@
                 <field name="status_apo" invisible="1"/>
                 <field name="action"/>
                 <field name="note"/>
+                <field name="note_detail"/>
                 <field name="date_po" optional="hide"/>
                 <field name="so_number"/>
                 <field name="check_pj" invisible="1"/>
@@ -59,6 +60,7 @@
                             <field name="purchase_representative_id"/>
                             <field name="vendor_id"/>
                             <field name="note"/>
+                            <field name="note_detail"/>
                         </group>
                     </group>
                 </sheet>
diff --git a/indoteknik_custom/views/purchasing_job_state.xml b/indoteknik_custom/views/purchasing_job_state.xml
index c7c40020..ca08e44c 100644
--- a/indoteknik_custom/views/purchasing_job_state.xml
+++ b/indoteknik_custom/views/purchasing_job_state.xml
@@ -8,7 +8,8 @@
                 <sheet>
                     <group>
                         <field name="status_apo" readonly="1"/>
-                        <field name="note"/>
+                        <field name="note" invisible="1"/>
+                        <field name="note_detail"/>
                     </group>
                 </sheet>
             </form>
-- 
cgit v1.2.3


From d5ff9c0dce0cb83bb9f2f4853097dc4dfb104f40 Mon Sep 17 00:00:00 2001
From: stephanchrst <stephanchrst@gmail.com>
Date: Wed, 21 Jan 2026 09:03:21 +0700
Subject: add pricing group up to 10

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/price_group.xml b/indoteknik_custom/views/price_group.xml
index 5db8756e..7fad8d8d 100644
--- a/indoteknik_custom/views/price_group.xml
+++ b/indoteknik_custom/views/price_group.xml
@@ -26,6 +26,8 @@
                     <field name="group6"/>
                     <field name="group7"/>
                     <field name="group8"/>
+                    <field name="group9"/>
+                    <field name="group10"/>
                 </tree>
             </field>
         </record>
@@ -48,6 +50,8 @@
                                 <field name="group6"/>
                                 <field name="group7"/>
                                 <field name="group8"/>
+                                <field name="group9"/>
+                                <field name="group10"/>
                             </group>
                         </group>
                     </sheet>
-- 
cgit v1.2.3


From 9e64a74e4576a150d172359999c9eb3cef8505a8 Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Thu, 22 Jan 2026 17:46:05 +0700
Subject: <hafid> cab inv

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index 02061251..d5cec350 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -82,6 +82,7 @@
                                 <field name="x_negara_asal"/>
                                 <field name="x_short_desc"/>
                                 <field name="x_manufacture_level"/>
+                                <!-- <field name="cashback_percent" widget="percentage"/> -->
                                 <field name="x_produk_aksesoris_sparepart"/>
                                 <field name="cache_reset_status"/>
                                 <field name="parent_id"/>
-- 
cgit v1.2.3


From abe9e16dff1d7b65530b258a306a6376b71c655b Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Fri, 23 Jan 2026 13:39:30 +0700
Subject: <hafid> cashback brand

---
 indoteknik_custom/views/sale_order.xml     | 1 +
 indoteknik_custom/views/x_manufactures.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 23fbe155..c3df92ec 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -302,6 +302,7 @@
                             ]
                         }
                     "/>
+                    <field name="amount_cashback"/>
                     <field name="purchase_price_md" optional="hide"/>
                     <field name="purchase_tax_id"
                            attrs="{'readonly': [('parent.approval_status', '!=', False)]}"
diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index d5cec350..b52fe795 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -82,7 +82,7 @@
                                 <field name="x_negara_asal"/>
                                 <field name="x_short_desc"/>
                                 <field name="x_manufacture_level"/>
-                                <!-- <field name="cashback_percent" widget="percentage"/> -->
+                                <field name="cashback_percent" widget="percentage"/>
                                 <field name="x_produk_aksesoris_sparepart"/>
                                 <field name="cache_reset_status"/>
                                 <field name="parent_id"/>
-- 
cgit v1.2.3


From e52ef1be01707cb049dae84d061e49b316d6c17c Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <andrifebriyadiputra@gmail.com>
Date: Mon, 26 Jan 2026 08:45:40 +0700
Subject: hide note

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchasing_job.xml b/indoteknik_custom/views/purchasing_job.xml
index d303e5ea..8e1eb3b6 100644
--- a/indoteknik_custom/views/purchasing_job.xml
+++ b/indoteknik_custom/views/purchasing_job.xml
@@ -16,7 +16,7 @@
                 <field name="outgoing"/>
                 <field name="status_apo" invisible="1"/>
                 <field name="action"/>
-                <field name="note"/>
+                <field name="note" optional="hide"/>
                 <field name="note_detail"/>
                 <field name="date_po" optional="hide"/>
                 <field name="so_number"/>
@@ -59,7 +59,7 @@
                             <field name="outgoing"/>
                             <field name="purchase_representative_id"/>
                             <field name="vendor_id"/>
-                            <field name="note"/>
+                            <!-- <field name="note"/> -->
                             <field name="note_detail"/>
                         </group>
                     </group>
-- 
cgit v1.2.3


From 4ac8b06616a0dce80029e1063078b31b6100084e Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Fri, 30 Jan 2026 15:52:21 +0700
Subject: <hafid> refund kebutuhan BA dan cahsback

---
 indoteknik_custom/views/sale_order.xml     | 2 +-
 indoteknik_custom/views/x_manufactures.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index c3df92ec..7a517ca7 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -302,7 +302,7 @@
                             ]
                         }
                     "/>
-                    <field name="amount_cashback"/>
+                    <!-- <field name="amount_cashback"/> -->
                     <field name="purchase_price_md" optional="hide"/>
                     <field name="purchase_tax_id"
                            attrs="{'readonly': [('parent.approval_status', '!=', False)]}"
diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index b52fe795..d5cec350 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -82,7 +82,7 @@
                                 <field name="x_negara_asal"/>
                                 <field name="x_short_desc"/>
                                 <field name="x_manufacture_level"/>
-                                <field name="cashback_percent" widget="percentage"/>
+                                <!-- <field name="cashback_percent" widget="percentage"/> -->
                                 <field name="x_produk_aksesoris_sparepart"/>
                                 <field name="cache_reset_status"/>
                                 <field name="parent_id"/>
-- 
cgit v1.2.3


From 48e48a61a6fc0addcc1e0c3590ca8582abe66a6a Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Fri, 30 Jan 2026 18:19:30 +0700
Subject: <hafid> refund kebutuhan BA dan cahsback

---
 indoteknik_custom/views/sale_order.xml     | 2 +-
 indoteknik_custom/views/x_manufactures.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 7a517ca7..c3df92ec 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -302,7 +302,7 @@
                             ]
                         }
                     "/>
-                    <!-- <field name="amount_cashback"/> -->
+                    <field name="amount_cashback"/>
                     <field name="purchase_price_md" optional="hide"/>
                     <field name="purchase_tax_id"
                            attrs="{'readonly': [('parent.approval_status', '!=', False)]}"
diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index d5cec350..b52fe795 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -82,7 +82,7 @@
                                 <field name="x_negara_asal"/>
                                 <field name="x_short_desc"/>
                                 <field name="x_manufacture_level"/>
-                                <!-- <field name="cashback_percent" widget="percentage"/> -->
+                                <field name="cashback_percent" widget="percentage"/>
                                 <field name="x_produk_aksesoris_sparepart"/>
                                 <field name="cache_reset_status"/>
                                 <field name="parent_id"/>
-- 
cgit v1.2.3


From 8b28af52afe07363209601a1ad1cb90b7778d1d8 Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Mon, 2 Feb 2026 14:48:34 +0700
Subject: <hafid> fix margin po 2

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 16b8bd44..59e317d2 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -105,6 +105,7 @@
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
                     <field name="total_so_margin"/>
+                    <field name="amount_cashback"/>
                     <field name="total_percent_margin"/>
                     <field name="total_so_percent_margin"/>
                 </field>
-- 
cgit v1.2.3


From 5118ff0549de5bea4e83b31da2c2347f227c488a Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Mon, 2 Feb 2026 14:55:02 +0700
Subject: <hafid> pusing margin po

---
 indoteknik_custom/views/purchase_order.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 59e317d2..16b8bd44 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -105,7 +105,6 @@
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
                     <field name="total_so_margin"/>
-                    <field name="amount_cashback"/>
                     <field name="total_percent_margin"/>
                     <field name="total_so_percent_margin"/>
                 </field>
-- 
cgit v1.2.3


From 37ccff02eb47b50ca6d23e4cd027155381c53947 Mon Sep 17 00:00:00 2001
From: HafidBuroiroh <hafidburoiroh09@gmail.com>
Date: Mon, 2 Feb 2026 16:59:12 +0700
Subject: <hafid> coba margin po last

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 16b8bd44..59e317d2 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -105,6 +105,7 @@
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
                     <field name="total_so_margin"/>
+                    <field name="amount_cashback"/>
                     <field name="total_percent_margin"/>
                     <field name="total_so_percent_margin"/>
                 </field>
-- 
cgit v1.2.3