From 3ca53ea0afef07cb79040c9f3c5aa29fa2355c90 Mon Sep 17 00:00:00 2001
From: trisusilo48 <tri.susilo@altama.co.id>
Date: Thu, 27 Mar 2025 08:48:27 +0700
Subject: sale order delay

---
 indoteknik_custom/views/sale_order_delay.xml | 44 ++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 indoteknik_custom/views/sale_order_delay.xml

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order_delay.xml b/indoteknik_custom/views/sale_order_delay.xml
new file mode 100644
index 00000000..b2aad8eb
--- /dev/null
+++ b/indoteknik_custom/views/sale_order_delay.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_sale_order_delay_tree" model="ir.ui.view">
+        <field name="name">sale.order.delay.tree</field>
+        <field name="model">sale.order.delay</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="so_number" />
+                <field name="days_delayed" />
+                <field name="status" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="sale_order_delay_action" model="ir.actions.act_window">
+        <field name="name">Sale Order Delay</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order.delay</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <record id="view_sale_order_delay_form" model="ir.ui.view">
+        <field name="name">sale.order.delay.form</field>
+        <field name="model">sale.order.delay</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="so_number" />
+                        <field name="days_delayed" />
+                        <field name="status" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <menuitem id="menu_sale_order_delay"
+        name="Sale Order Delay"
+         action="sale_order_delay_action"
+        parent="sale.product_menu_catalog"
+        sequence="8"
+    />
+</odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 4688c123005c7c8038c4d56ef25307e309ef815e Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 13 May 2025 15:26:01 +0700
Subject: (andri) add field Selection Option dan menambahkan opsi biteship

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 79a095fb..080549a4 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -118,6 +118,7 @@
                     <field name="approval_status" />
                     <field name="sales_tax_id"
                         domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1" />
+                    <field name="select_shipping_option" required="1"/>
                     <field name="carrier_id" required="1" />
                     <field name="delivery_service_type" readonly="1" />
                     <field name="shipping_option_id" />
-- 
cgit v1.2.3


From 63243a7b70292e9c48a21e2badbb07c398bc4166 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Mon, 19 May 2025 16:07:03 +0700
Subject: (andri) add field langitude & longitude pada customer & perbaikan
 biteship

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index cb9fa3ac..9fb6530c 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -65,6 +65,10 @@
                 <group name="purchase" position="inside">
                     <field name="leadtime"/>
                 </group>
+                <field name="vat" position="before">
+                    <field name="latitude"/>
+                    <field name="longtitude"/>
+                </field>
                 <field name="vat" position="after">
                     <field name="email_finance" widget="email"/>
                     <field name="email_sales" widget="email"/>
-- 
cgit v1.2.3


From e987dc891e999ebd1d04fb4f8cdeb44134c67aed Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Mon, 19 May 2025 22:21:31 +0700
Subject: (andri) fix bug shipping method

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 080549a4..eabd5aba 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -119,7 +119,7 @@
                     <field name="sales_tax_id"
                         domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1" />
                     <field name="select_shipping_option" required="1"/>
-                    <field name="carrier_id" required="1" />
+                    <field name="carrier_id" required="1" domain="[]" />
                     <field name="delivery_service_type" readonly="1" />
                     <field name="shipping_option_id" />
                 </field>
-- 
cgit v1.2.3


From d38635f75fe52cbc958d96e577a83d8b3e1e1272 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 20 May 2025 13:47:18 +0700
Subject: (andri) fix set shipping option sesuai dengan method yang dipilih

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index eabd5aba..1a0895dc 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -121,7 +121,7 @@
                     <field name="select_shipping_option" required="1"/>
                     <field name="carrier_id" required="1" domain="[]" />
                     <field name="delivery_service_type" readonly="1" />
-                    <field name="shipping_option_id" />
+                    <field name="shipping_option_id"/>
                 </field>
                 <field name="medium_id" position="after">
                     <field name="date_doc_kirim" readonly="1" />
-- 
cgit v1.2.3


From 34174e95638e1337169dfa5f3be56b9ef57021a1 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 22 May 2025 11:14:35 +0700
Subject: (andri) sync quotation web ke odoo terkait kurir, service, & tarif

---
 indoteknik_custom/views/sale_order.xml | 4 ++--
 1 file 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 1a0895dc..34397fc7 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -118,10 +118,10 @@
                     <field name="approval_status" />
                     <field name="sales_tax_id"
                         domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1" />
-                    <field name="select_shipping_option" required="1"/>
+                    <field name="select_shipping_option"/>
                     <field name="carrier_id" required="1" domain="[]" />
                     <field name="delivery_service_type" readonly="1" />
-                    <field name="shipping_option_id"/>
+                    <field name="shipping_option_id" />
                 </field>
                 <field name="medium_id" position="after">
                     <field name="date_doc_kirim" readonly="1" />
-- 
cgit v1.2.3


From fad209db285b0a6204dc1fcbf2e2e0cb13f872b0 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Fri, 23 May 2025 09:05:27 +0700
Subject: (andri) penyesuaian data quotation SO ke delivery biteship

---
 indoteknik_custom/views/sale_order.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 34397fc7..7e01ba0b 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -279,6 +279,12 @@
                     <field name="picking_iu_id" />
                     <field name="note_ekspedisi" />
                 </field>
+                <field name="select_shipping_option" position="attributes">
+                    <attribute name="attrs">
+                        {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
+                        ['cancel','draft'])]}
+                    </attribute>
+                </field>
                 <field name="carrier_id" position="attributes">
                     <attribute name="attrs">
                         {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
-- 
cgit v1.2.3


From 4ed94e9e1de027aba326ff3dce954b765f752009 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 28 May 2025 09:00:30 +0700
Subject: (andri) penambahan log note ketika biteship berhasil & penyesuaian
 field required pada SO

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 7e01ba0b..c00d68a1 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -118,7 +118,7 @@
                     <field name="approval_status" />
                     <field name="sales_tax_id"
                         domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1" />
-                    <field name="select_shipping_option"/>
+                    <field name="select_shipping_option" required="1"/>
                     <field name="carrier_id" required="1" domain="[]" />
                     <field name="delivery_service_type" readonly="1" />
                     <field name="shipping_option_id" />
-- 
cgit v1.2.3


From c652ee3e1f652d23e37833f01e3fdd7aa8e52021 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 31 May 2025 11:03:06 +0700
Subject: (andri) add tracking biteship pada BU OUT & fix delivery departure &
 arrival date

---
 indoteknik_custom/views/stock_picking.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index c916f2ef..9b16639c 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -61,6 +61,12 @@
                     <button name="action_send_to_biteship"
                             string="Biteship"
                             type="object"
+                    />
+                     <button name="action_sync_biteship_tracking"
+                        type="object"
+                        string="Lacak dari Biteship"
+                        class="btn-primary"
+                        attrs="{'invisible': [('biteship_id', '=', False)]}"
                     />
                     <button name="track_envio_shipment"
                             string="Tracking Envio"
@@ -178,6 +184,7 @@
                                 <field name="note_info"/>
                                 <field name="responsible" />
                                 <field name="carrier_id"/>
+                                <field name="biteship_id" invisible="1"/>
                                 <field name="out_code" attrs="{'invisible': [['out_code', '=', False]]}"/>
                                 <field name="picking_code" attrs="{'invisible': [['picking_code', '=', False]]}"/>
                                 <field name="picking_code" string="Picking code (akan digenerate ketika sudah di-validate)" attrs="{'invisible': [['picking_code', '!=', False]]}"/>
-- 
cgit v1.2.3


From 1a0b0cb4a740d831f69ea29943cfa0aed8e31fac Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Mon, 2 Jun 2025 09:17:29 +0700
Subject: <hafid> fix email to putra & darren>

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/user_pengajuan_tempo.xml b/indoteknik_custom/views/user_pengajuan_tempo.xml
index 4eebe9e4..f9dca4ca 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo.xml
@@ -204,7 +204,7 @@
             <field name="subject">Pengajuan Tempo Harus di Periksa!</field>
             <field name="email_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
             <field name="reply_to">sales@indoteknik.com</field>
-            <field name="email_to">vita@indoteknik.co.id</field>
+            <field name="email_to">putra@indoteknik.co.id,Darren@indoteknik.co.id</field>
 <!--            <field name="email_to">sapiabon768@gmail.com</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;">
-- 
cgit v1.2.3


From 01029f94471df384decb606dbb3088f31a5a8108 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 3 Jun 2025 09:49:28 +0700
Subject: push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 0fabf279..34540cc5 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -403,7 +403,7 @@
                 <field name="state" position="after">
                     <field name="approval_status"/>
                     <field name="client_order_ref"/>
-                    <field name="notes"/>
+                    <field name="notes" optional="hide"/>
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
                     <field name="pareto_status" optional="hide"/>
-- 
cgit v1.2.3


From 3882ee6c3299525eeb8924cd9c7245f65cd15a28 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 3 Jun 2025 15:42:20 +0700
Subject: add notes to tree so

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 34540cc5..03c978a7 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -428,6 +428,7 @@
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
                     <field name="pareto_status" optional="hide"/>
+                    <field name="notes" optional="hide"/>
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3


From fa2c8cc7b00e963e740307484c174961f61ffc84 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 5 Jun 2025 08:35:39 +0700
Subject: (andri) add field Journal Uang Muka di PO dan Purchase Order pada CAB

---
 indoteknik_custom/views/account_move.xml   | 1 +
 indoteknik_custom/views/purchase_order.xml | 1 +
 2 files changed, 2 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 46737a40..9217cc2a 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -31,6 +31,7 @@
                 </field>
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
+                    <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/>
                 </field>
                 <field name="partner_shipping_id" position="before">
                     <field name="real_invoice_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 0fbbb5e7..99362798 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -65,6 +65,7 @@
                     <field name="total_cost_service" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
                     <field name="total_delivery_amt" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
                     <field name="product_bom_id"/>
+                    <field name="move_id" domain="[('move_type','=','entry')]" context="{'form_view_ref': 'account.view_move_form'}" options="{'no_create': True}"/>
                 </field>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
-- 
cgit v1.2.3


From 55fb073416a7f8504c3819178aa7b6883304335f Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 5 Jun 2025 10:53:30 +0700
Subject: (andri) merubah peletakan CAB menjadi berada di atas sebelah tombol
 receipt

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 99362798..12ad6864 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -14,6 +14,19 @@
                             attrs="{'invisible': ['|', ('sale_order_id', '=', False), ('state', 'not in', ['draft'])]}"
                     />
                 </div>
+                <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
+                    <button type="object"
+                        name="action_view_journal_uangmuka"
+                        class="oe_stat_button"
+                        icon="fa-book"
+                        attrs="{'invisible':[('move_id','=',False)]}"
+                        style="width: 200px;">
+                        <field name="move_id" widget="statinfo" string="Journal Uang Muka"/>
+                        <span class="o_stat_text">
+                            <t t-esc="record.move_id.name"/>
+                        </span>
+                    </button>
+                </xpath>
                 <button id="draft_confirm" position="after">
                     <button name="po_approve"
                             string="Ask Approval"
-- 
cgit v1.2.3


From add53c91a49d43b20438b14cf48aaececbabf2cd Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 5 Jun 2025 11:43:02 +0700
Subject: <miqdad> add before margin in order line

---
 indoteknik_custom/views/sale_order.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 03c978a7..4b74825e 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -208,6 +208,11 @@
                         <label for="item_percent_margin"/>
                         <field name="item_percent_margin"/>
                     </div>
+                    <div name="item_percent_margin_before" groups="base.group_no_one"
+                         attrs="{'invisible': [('display_type', '!=', False)]}">
+                        <label for="item_percent_margin_before"/>
+                        <field name="item_percent_margin_before"/>
+                    </div>
                 </div>
                 <div name="invoice_lines" position="before">
                     <div name="price_subtotal" groups="base.group_no_one"
@@ -239,6 +244,7 @@
                            attrs="{'readonly': [('parent.approval_status', '!=', False)]}"
                            domain="[('type_tax_use','=','purchase')]" options="{'no_create':True}"/>
                     <field name="item_percent_margin"/>
+                    <field name="item_percent_margin_before"/>
                     <field name="item_margin" optional="hide"/>
                     <field name="margin_md" optional="hide"/>
                     <field name="note" optional="hide"/>
-- 
cgit v1.2.3


From 288a7f333c1d37574dba76f3fb3f7216da259cae Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 7 Jun 2025 09:41:27 +0700
Subject: (andri) add field shipping option pada stock picking sebagai tambahan
 info

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 9b16639c..b0d55104 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -91,7 +91,9 @@
                     />
                 </button>
                 <field name="backorder_id" position="after">
+                    <field name="select_shipping_option_so"/>
                     <field name="shipping_method_so_id"/>
+                    <field name="shipping_option_so_id"/>
                     <field name="summary_qty_detail"/>
                     <field name="count_line_detail"/>
                     <field name="dokumen_tanda_terima"/>
-- 
cgit v1.2.3


From d3538371691a43efbd5527b746c942bdef9fd1ba Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 7 Jun 2025 11:02:03 +0700
Subject: (andri) Pada PO, CAB tidak tampil jika statusnya bukan posted

---
 indoteknik_custom/views/purchase_order.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 12ad6864..a78f300c 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -15,11 +15,12 @@
                     />
                 </div>
                 <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
+                    <field name="is_cab_visible" invisible="1"/>
                     <button type="object"
                         name="action_view_journal_uangmuka"
                         class="oe_stat_button"
                         icon="fa-book"
-                        attrs="{'invisible':[('move_id','=',False)]}"
+                        attrs="{'invisible': [('is_cab_visible', '=', False)]}"
                         style="width: 200px;">
                         <field name="move_id" widget="statinfo" string="Journal Uang Muka"/>
                         <span class="o_stat_text">
@@ -78,7 +79,7 @@
                     <field name="total_cost_service" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
                     <field name="total_delivery_amt" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
                     <field name="product_bom_id"/>
-                    <field name="move_id" domain="[('move_type','=','entry')]" context="{'form_view_ref': 'account.view_move_form'}" options="{'no_create': True}"/>
+                    <!-- <field name="move_id" domain="[('move_type','=','entry')]" context="{'form_view_ref': 'account.view_move_form'}" options="{'no_create': True}"/> -->
                 </field>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
-- 
cgit v1.2.3


From 984e128294f4c3d9d3d8eab8dacf03846f8336b2 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 7 Jun 2025 15:53:32 +0700
Subject: (andri) revisi peletakan CAB pada PO dan add field reklas misc

---
 indoteknik_custom/views/account_move.xml   | 6 ++++++
 indoteknik_custom/views/purchase_order.xml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 9217cc2a..dda7f272 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -6,6 +6,12 @@
             <field name="model">account.move</field>
             <field name="inherit_id" ref="account.view_move_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//div[@name='journal_div']" position="after">
+                    <field name="reklas_misc_id"
+                        string="No Jurnal Reklas (MISC)"
+                        attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"
+                        readonly="1"/>
+                </xpath>
                 <button name="action_register_payment" position="after">
                     <button name="indoteknik_custom.action_view_invoice_reklas" string="Reklas"
                         type="action" class="btn-primary"  attrs="{'invisible': [('state', '!=', 'posted')]}"/>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index a78f300c..9084bcbb 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -14,7 +14,7 @@
                             attrs="{'invisible': ['|', ('sale_order_id', '=', False), ('state', 'not in', ['draft'])]}"
                     />
                 </div>
-                <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
+                <xpath expr="//button[@name='action_view_invoice']" position="before">
                     <field name="is_cab_visible" invisible="1"/>
                     <button type="object"
                         name="action_view_journal_uangmuka"
-- 
cgit v1.2.3


From 9200e74126c99410b79ef2c344915251bef6af19 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 7 Jun 2025 15:55:40 +0700
Subject: (andri) edit penamaan field Reklas

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index dda7f272..07efc077 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='journal_div']" position="after">
                     <field name="reklas_misc_id"
-                        string="No Jurnal Reklas (MISC)"
+                        string="Journal Entries Reklas"
                         attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"
                         readonly="1"/>
                 </xpath>
-- 
cgit v1.2.3


From 5c76eb43188de9a09380dc43dcc19120b6ebfc84 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 10 Jun 2025 09:24:25 +0700
Subject: add kanban to manufactures

---
 indoteknik_custom/views/x_manufactures.xml | 40 +++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index 01e90a1e..02061251 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -3,7 +3,7 @@
         <record id="x_manufactures_action" model="ir.actions.act_window">
             <field name="name">Manufacture</field>
             <field name="res_model">x_manufactures</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">kanban,tree,form</field>  <!-- Tambahkan kanban di sini -->
             <field name="help" type="html">
                 <p class="o_view_nocontent_smiling_face">
                     Add Manufactures!
@@ -11,6 +11,44 @@
             </field>
         </record>
 
+        <record id="x_manufactures_kanban" model="ir.ui.view">
+            <field name="name">Manufactures Kanban</field>
+            <field name="model">x_manufactures</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="x_manufacture_level">
+                    <field name="id"/> <!-- Tambahkan ini -->
+                    <field name="x_name"/>
+                    <field name="x_logo_manufacture"/>
+                    <field name="x_manufacture_level"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_kanban_global_click">
+                                <div class="o_kanban_image">
+                                    <img t-if="record.x_logo_manufacture.raw_value" 
+                                         t-att-src="kanban_image('x_manufactures', 'x_logo_manufacture', record.id.raw_value)" 
+                                         alt="Logo" class="img-fluid" width="64" height="64"/>
+                                    <img t-else="" 
+                                         src="/web/static/src/img/placeholder.png" 
+                                         alt="No Logo" class="img-fluid" width="64" height="64"/>
+                                </div>
+                                <div class="o_kanban_details">
+                                    <strong><field name="x_name"/></strong>
+                                    <div>
+                                        <span class="badge badge-secondary">
+                                            <field name="x_manufacture_level"/>
+                                        </span>
+                                    </div>
+                                    <div t-if="record.x_short_desc.raw_value">
+                                        <small><field name="x_short_desc"/></small>
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
         <record id="x_manufactures_tree" model="ir.ui.view">
             <field name="name">Manufactures</field>
             <field name="model">x_manufactures</field>
-- 
cgit v1.2.3


From 5ca33915f1e3d052cfa989163d43a15dbc9ddec9 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 10 Jun 2025 11:17:57 +0700
Subject: (andri) add button get koordinat pada contact

---
 indoteknik_custom/views/res_partner.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 9fb6530c..f4c1be31 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -68,6 +68,26 @@
                 <field name="vat" position="before">
                     <field name="latitude"/>
                     <field name="longtitude"/>
+
+                    <button name="geocode_address" type="object" string="Cari Lokasi dari Alamat" class="btn btn-primary"/>
+
+                    <separator string="Map Lokasi"/>
+                    <div style="height: 400px;">
+                        <t t-if="record.latitude.value and record.longtitude.value">
+                            <t t-set="google_maps_api_key" t-value="request.env['ir.config_parameter'].sudo().get_param('google.maps.api_key')"/>
+                            <iframe
+                                t-att-src="'https://www.google.com/maps/embed/v1/place?key=' + google_maps_api_key + '&amp;q=' + str(record.latitude.value) + ',' + str(record.longtitude.value)"
+                                width="100%"
+                                height="400"
+                                style="border:0;"
+                                allowfullscreen=""
+                                loading="lazy"
+                            ></iframe>
+                        </t>
+                        <t t-else="">
+                            <p>Isi alamat lalu klik "Cari Lokasi dari Alamat" untuk menampilkan peta.</p>
+                        </t>
+                    </div>
                 </field>
                 <field name="vat" position="after">
                     <field name="email_finance" widget="email"/>
-- 
cgit v1.2.3


From c827294ee6dd613de089af846521cfdc76550e16 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 10 Jun 2025 13:10:35 +0700
Subject: (andri) revisi mengenai onchange create reklas dan yang lain

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 07efc077..3a620a6a 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -38,6 +38,7 @@
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
                     <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/>
+                    <field name="bill_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
                 </field>
                 <field name="partner_shipping_id" position="before">
                     <field name="real_invoice_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
-- 
cgit v1.2.3


From d89f6b21f0174d52b1efb7d54ec3443bbbe3fbcb Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 10 Jun 2025 14:00:00 +0700
Subject: (andri) penyesuaian munculnya field

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 3a620a6a..0c2f9a68 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -37,8 +37,8 @@
                 </field>
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
-                    <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/>
-                    <field name="bill_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
+                    <!-- <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/> -->
+                    <field name="bill_id" readonly="1"  attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('purchase_order_id', '!=', False)]}"/>
                 </field>
                 <field name="partner_shipping_id" position="before">
                     <field name="real_invoice_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
-- 
cgit v1.2.3


From df0467f8e493840f3013bc58ca26fc6d98793c95 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 10 Jun 2025 15:47:32 +0700
Subject: (andri) add openstreetmaps pada contact

---
 indoteknik_custom/views/res_partner.xml | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index f4c1be31..c23500c8 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -70,24 +70,7 @@
                     <field name="longtitude"/>
 
                     <button name="geocode_address" type="object" string="Cari Lokasi dari Alamat" class="btn btn-primary"/>
-
-                    <separator string="Map Lokasi"/>
-                    <div style="height: 400px;">
-                        <t t-if="record.latitude.value and record.longtitude.value">
-                            <t t-set="google_maps_api_key" t-value="request.env['ir.config_parameter'].sudo().get_param('google.maps.api_key')"/>
-                            <iframe
-                                t-att-src="'https://www.google.com/maps/embed/v1/place?key=' + google_maps_api_key + '&amp;q=' + str(record.latitude.value) + ',' + str(record.longtitude.value)"
-                                width="100%"
-                                height="400"
-                                style="border:0;"
-                                allowfullscreen=""
-                                loading="lazy"
-                            ></iframe>
-                        </t>
-                        <t t-else="">
-                            <p>Isi alamat lalu klik "Cari Lokasi dari Alamat" untuk menampilkan peta.</p>
-                        </t>
-                    </div>
+                    <field name="map_view" widget="openstreetmap"/>
                 </field>
                 <field name="vat" position="after">
                     <field name="email_finance" widget="email"/>
-- 
cgit v1.2.3


From 503fb1e0adb8eca300133bde10a4bbd8e16d2cb5 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 11 Jun 2025 08:52:46 +0700
Subject: (andri) buat page maps pada contact

---
 indoteknik_custom/views/res_partner.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index c23500c8..5ca61834 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -65,13 +65,16 @@
                 <group name="purchase" position="inside">
                     <field name="leadtime"/>
                 </group>
-                <field name="vat" position="before">
-                    <field name="latitude"/>
-                    <field name="longtitude"/>
-
-                    <button name="geocode_address" type="object" string="Cari Lokasi dari Alamat" class="btn btn-primary"/>
-                    <field name="map_view" widget="openstreetmap"/>
-                </field>
+                <xpath expr="//notebook/page[@name='contact_addresses']" position="before">
+                    <page string="Lokasi Peta" name="map_location" autofocus="autofocus">
+                        <group>
+                            <field name="latitude" readonly="1"/>
+                            <field name="longtitude" readonly="1"/>
+                            <button name="geocode_address" type="object" string="Dapatkan PinPoint Lokasi" class="btn btn-primary"/>
+                            <field name="map_view" widget="openstreetmap"/>
+                        </group>
+                    </page>
+                </xpath>
                 <field name="vat" position="after">
                     <field name="email_finance" widget="email"/>
                     <field name="email_sales" widget="email"/>
-- 
cgit v1.2.3


From a6629db53b6080bd2217e426b434c2ecc72588ab Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 11 Jun 2025 09:14:42 +0700
Subject: (andri) add button INFORMATION DETAIL pada popup detail contact &
 addresses

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 5ca61834..468de1d5 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -88,6 +88,15 @@
                     <field name="main_parent_id" invisible="1" />
                     <field name="site_id" attrs="{'readonly': [('parent_id', '=', False)]}" domain="[('partner_id', '=', main_parent_id)]" context="{'default_partner_id': active_id}" />
                 </xpath>
+                <xpath expr="//field[@name='child_ids']/form/sheet/group" position="after">
+                    <div class="oe_left" style="margin-top: 16px;">
+                        <button name="action_open_full_form"
+                                type="object"
+                                string="Detail Information"
+                                class="btn btn-primary"
+                                />
+                    </div>
+                </xpath>
                 <xpath expr="//field[@name='property_payment_term_id']" position="attributes">
                     <attribute name="readonly">0</attribute>
                 </xpath>
-- 
cgit v1.2.3


From fd81ce03251ece6a723997a0d5a725cea0191826 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 11 Jun 2025 09:20:16 +0700
Subject: (andri) revisi tampilan Lokasi Peta pada Contact

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 468de1d5..00927326 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -68,10 +68,10 @@
                 <xpath expr="//notebook/page[@name='contact_addresses']" position="before">
                     <page string="Lokasi Peta" name="map_location" autofocus="autofocus">
                         <group>
-                            <field name="latitude" readonly="1"/>
-                            <field name="longtitude" readonly="1"/>
                             <button name="geocode_address" type="object" string="Dapatkan PinPoint Lokasi" class="btn btn-primary"/>
                             <field name="map_view" widget="openstreetmap"/>
+                            <field name="latitude" readonly="1"/>
+                            <field name="longtitude" readonly="1"/>
                         </group>
                     </page>
                 </xpath>
-- 
cgit v1.2.3


From 361b55a0a8b9837ddf4fec369b66e5d8dd628fbf Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 11 Jun 2025 09:36:01 +0700
Subject: (andri) tampilan maps lebih luas

---
 indoteknik_custom/views/res_partner.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 00927326..b7834fb4 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -69,7 +69,11 @@
                     <page string="Lokasi Peta" name="map_location" autofocus="autofocus">
                         <group>
                             <button name="geocode_address" type="object" string="Dapatkan PinPoint Lokasi" class="btn btn-primary"/>
-                            <field name="map_view" widget="openstreetmap"/>
+                        </group>
+                        <div style="margin: 16px 0;">
+                            <field name="map_view" widget="openstreetmap" nolabel="1" style="width: 100%;"/>
+                        </div>
+                        <group>
                             <field name="latitude" readonly="1"/>
                             <field name="longtitude" readonly="1"/>
                         </group>
-- 
cgit v1.2.3


From 771cd3b9f5c0a6594b6e276bc47e3599d6c751e4 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 11 Jun 2025 09:50:05 +0700
Subject: (andri) add validasi tidak bisa pinpoint ketika alamat yang diisikan
 belum lengkap

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index b7834fb4..6acfeaa0 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -66,9 +66,9 @@
                     <field name="leadtime"/>
                 </group>
                 <xpath expr="//notebook/page[@name='contact_addresses']" position="before">
-                    <page string="Lokasi Peta" name="map_location" autofocus="autofocus">
+                    <page string="Pin Point Location" name="map_location" autofocus="autofocus">
                         <group>
-                            <button name="geocode_address" type="object" string="Dapatkan PinPoint Lokasi" class="btn btn-primary"/>
+                            <button name="geocode_address" type="object" string="Get Pin Point Location" class="btn btn-primary"/>
                         </group>
                         <div style="margin: 16px 0;">
                             <field name="map_view" widget="openstreetmap" nolabel="1" style="width: 100%;"/>
-- 
cgit v1.2.3


From be7c601f44c3fab282dc91559a62a024d09e3f73 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 12 Jun 2025 15:07:21 +0700
Subject: (andri) hapus validasi negara pada pinpoint & hapus autofokus page
 pinpoin

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 6acfeaa0..85ee5ef0 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -66,7 +66,7 @@
                     <field name="leadtime"/>
                 </group>
                 <xpath expr="//notebook/page[@name='contact_addresses']" position="before">
-                    <page string="Pin Point Location" name="map_location" autofocus="autofocus">
+                    <page string="Pin Point Location" name="map_location">
                         <group>
                             <button name="geocode_address" type="object" string="Get Pin Point Location" class="btn btn-primary"/>
                         </group>
-- 
cgit v1.2.3


From a921017a829ebef8442740fac964260d98566e6a Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 12 Jun 2025 19:26:46 +0700
Subject: (andri) try gmaps sebagai pengganti openstreetmaps

---
 indoteknik_custom/views/res_partner.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 85ee5ef0..4cee0c47 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -66,14 +66,15 @@
                     <field name="leadtime"/>
                 </group>
                 <xpath expr="//notebook/page[@name='contact_addresses']" position="before">
-                    <page string="Pin Point Location" name="map_location">
+                    <page string="Pin Point Location" name="map_location" autofocus="autofocus">
                         <group>
                             <button name="geocode_address" type="object" string="Get Pin Point Location" class="btn btn-primary"/>
                         </group>
                         <div style="margin: 16px 0;">
-                            <field name="map_view" widget="openstreetmap" nolabel="1" style="width: 100%;"/>
+                            <field name="map_view" widget="googlemap" nolabel="1"/>
                         </div>
                         <group>
+                            <field name="address_map"/>
                             <field name="latitude" readonly="1"/>
                             <field name="longtitude" readonly="1"/>
                         </group>
-- 
cgit v1.2.3


From 34759639fa2db3b28bac410e24984775ce823ac5 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Fri, 13 Jun 2025 08:44:56 +0700
Subject: (andri) fix deprecated fungsi maps pada module custom

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 4cee0c47..bdce7c0c 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -66,7 +66,7 @@
                     <field name="leadtime"/>
                 </group>
                 <xpath expr="//notebook/page[@name='contact_addresses']" position="before">
-                    <page string="Pin Point Location" name="map_location" autofocus="autofocus">
+                    <page string="Pin Point Location" name="map_location">
                         <group>
                             <button name="geocode_address" type="object" string="Get Pin Point Location" class="btn btn-primary"/>
                         </group>
-- 
cgit v1.2.3


From 8a025fe63ea44b93d3978da7df3aa31533da5300 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 13 Jun 2025 09:13:08 +0700
Subject: <miqdad> add tukar guling model and view

---
 indoteknik_custom/views/tukar_guling.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 indoteknik_custom/views/tukar_guling.xml

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
new file mode 100644
index 00000000..e69de29b
-- 
cgit v1.2.3


From 0e7fdb8ea85c53de2c8ad5fa8674c5fbc489e45a Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Fri, 13 Jun 2025 10:58:27 +0700
Subject: (andri) bisa ubah alamat via ubah pinpoin langsung

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index bdce7c0c..f739cf14 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -75,8 +75,8 @@
                         </div>
                         <group>
                             <field name="address_map"/>
-                            <field name="latitude" readonly="1"/>
-                            <field name="longtitude" readonly="1"/>
+                            <field name="latitude" readonly="1" force_save="1"/>
+                            <field name="longtitude" readonly="1" force_save="1"/>
                         </group>
                     </page>
                 </xpath>
-- 
cgit v1.2.3


From 860abd78b0474279f851378f0b6507fe71fd76be Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 13 Jun 2025 11:39:00 +0700
Subject: <miqdad> PTG document name sequence

---
 indoteknik_custom/views/tukar_guling.xml | 50 ++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index e69de29b..34f2fa48 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="action_pengajuan_tukar_guling" model="ir.actions.act_window">
+        <field name="name">Pengajuan Tukar Guling</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">tukar.guling</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+   <menuitem
+        id="menu_pengajuan_tukar_guling"
+        name="Pengajuan Tukar Guling"
+        parent="stock.menu_warehouse_report"
+        sequence="3"
+        action="action_pengajuan_tukar_guling"
+    />
+
+    <record id="seq_tukar_guling" model="ir.sequence">
+        <field name="name">Pengajuan Tukar Guling</field>
+        <field name="code">tukar.guling</field>
+        <field name="prefix">PTG/</field>
+        <field name="padding">5</field>
+        <field name="number_next">1</field>
+        <field name="number_increment">1</field>
+        <field name="company_id" eval="False"/>
+    </record>
+
+    <record id="pengajuan_tukar_guling_tree" model="ir.ui.view">
+        <field name="name">pengajuan.tukar.guling.tree</field>
+        <field name="model">tukar.guling</field>
+        <field name="arch" type="xml">
+            <tree create="1" default_order="create_date desc">
+                    <field name="name"/>
+                    <field name="date"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="pengajuan_tukar_guling_form" model="ir.ui.view">
+        <field name="name">pengajuan.tukar.guling.form</field>
+        <field name="model">tukar.guling</field>
+        <field name="arch" type="xml">
+            <form>
+                <group>
+                    <field name="name" widget="text"/>
+                </group>
+            </form>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From d2c05ac97f195e196605d91088d6f76d9312e528 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 13 Jun 2025 17:19:28 +0700
Subject: <miqdad> match with meet

---
 indoteknik_custom/views/tukar_guling.xml | 149 ++++++++++++++++++++++---------
 1 file changed, 108 insertions(+), 41 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 34f2fa48..8fffcbb0 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -1,50 +1,117 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="action_pengajuan_tukar_guling" model="ir.actions.act_window">
-        <field name="name">Pengajuan Tukar Guling</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">tukar.guling</field>
-        <field name="view_mode">tree,form</field>
-    </record>
+    <data>
+        <!-- Action -->
+        <record id="action_pengajuan_tukar_guling" model="ir.actions.act_window">
+            <field name="name">Pengajuan Tukar Guling</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">tukar.guling</field>
+            <field name="view_mode">tree,form</field>
+        </record>
 
-   <menuitem
-        id="menu_pengajuan_tukar_guling"
-        name="Pengajuan Tukar Guling"
-        parent="stock.menu_warehouse_report"
-        sequence="3"
-        action="action_pengajuan_tukar_guling"
-    />
+        <!-- Menu -->
+        <menuitem
+                id="menu_pengajuan_tukar_guling"
+                name="Pengajuan Tukar Guling"
+                parent="stock.menu_warehouse_report"
+                sequence="3"
+                action="action_pengajuan_tukar_guling"
+        />
 
-    <record id="seq_tukar_guling" model="ir.sequence">
-        <field name="name">Pengajuan Tukar Guling</field>
-        <field name="code">tukar.guling</field>
-        <field name="prefix">PTG/</field>
-        <field name="padding">5</field>
-        <field name="number_next">1</field>
-        <field name="number_increment">1</field>
-        <field name="company_id" eval="False"/>
-    </record>
+        <!-- Sequence -->
+        <record id="seq_tukar_guling" model="ir.sequence">
+            <field name="name">Pengajuan Tukar Guling</field>
+            <field name="code">tukar.guling</field>
+            <field name="prefix">PTG/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="company_id" eval="False"/>
+        </record>
 
-    <record id="pengajuan_tukar_guling_tree" model="ir.ui.view">
-        <field name="name">pengajuan.tukar.guling.tree</field>
-        <field name="model">tukar.guling</field>
-        <field name="arch" type="xml">
-            <tree create="1" default_order="create_date desc">
+        <!-- Tree View -->
+        <record id="pengajuan_tukar_guling_tree" model="ir.ui.view">
+            <field name="name">pengajuan.tukar.guling.tree</field>
+            <field name="model">tukar.guling</field>
+            <field name="arch" type="xml">
+                <tree create="1" delete="1" default_order="create_date desc">
                     <field name="name"/>
                     <field name="date"/>
-            </tree>
-        </field>
-    </record>
+                    <field name="out_num" string="BU/Out"/>
+                    <field name="ba_num" string="Nomor BA"/>
+                    <field name="return_type" string="Return Type"/>
+                    <field name="state" widget="badge"
+                           decoration-info="state in ('draft', 'waiting')"
+                           decoration-success="state == 'done'"
+                           decoration-muted="state == 'cancel'"
+                    />
+                </tree>
+            </field>
+        </record>
 
-    <record id="pengajuan_tukar_guling_form" model="ir.ui.view">
-        <field name="name">pengajuan.tukar.guling.form</field>
-        <field name="model">tukar.guling</field>
-        <field name="arch" type="xml">
-            <form>
-                <group>
-                    <field name="name" widget="text"/>
-                </group>
-            </form>
-        </field>
-    </record>
+        <!-- Form View -->
+        <record id="pengajuan_tukar_guling_form" model="ir.ui.view">
+            <field name="name">pengajuan.tukar.guling.form</field>
+            <field name="model">tukar.guling</field>
+            <field name="arch" type="xml">
+                <form>
+                    <header>
+                        <button name="action_submit" string="Submit" type="object"
+                                class="btn-primary"
+                                attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+                        <button name="action_approve" string="Approve" type="object"
+                                class="btn-primary"
+                                attrs="{'invisible': [('state', '!=', 'waiting')]}"/>
+                        <button name="action_cancel" string="Cancel" type="object"
+                                class="btn-secondary"
+                                attrs="{'invisible': [('state', 'in', ('done', 'cancel'))]}"
+                                confirm="Are you sure you want to cancel this record?"/>
+                        <button name="action_draft" string="Set to Draft" type="object"
+                                class="btn-secondary"
+                                attrs="{'invisible': [('state', '!=', 'cancel')]}"
+                                confirm="Are you sure you want to reset this record to draft?"/>
+                        <field name="state" widget="statusbar"
+                               statusbar_visible="draft,waiting,done,cancel"/>
+                    </header>
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="name" readonly="1" class="oe_inline"/>
+                            </h1>
+                            <hr/>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="date" string="Date" readonly="1"/>
+                                <field name="out_num" string="BU/Out"/>
+                                <field name="ba_num" string="Nomor BA"/>
+                            </group>
+                            <group>
+                                <field name="return_type"/>
+                                <field name="notes"/>
+                                <field name="state" readonly="1"/>
+                            </group>
+                        </group>
+
+                        <!-- Product Lines -->
+                        <notebook>
+                            <page string="Product Lines" name="product_lines">
+                                <field name="line_ids">
+                                    <tree string="Product Lines" editable="bottom">
+                                        <field name="sequence" widget="handle"/>
+                                        <field name="product_id" required="1"
+                                               options="{'no_create': True, 'no_create_edit': True}"/>
+                                        <field name="name" force_save="1"/>
+                                        <field name="product_uom_qty" string="Quantity"/>
+                                        <field name="product_uom" string="UoM"
+                                               options="{'no_create': True, 'no_create_edit': True}"/>
+                                    </tree>
+                                </field>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+    </data>
 </odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 1cecf60302ea02e250a97ca2dbc6679332988bc0 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 14 Jun 2025 10:26:28 +0700
Subject: (andri) add search pada gmaps contact

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index f739cf14..30b5ca36 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -74,7 +74,7 @@
                             <field name="map_view" widget="googlemap" nolabel="1"/>
                         </div>
                         <group>
-                            <field name="address_map"/>
+                            <field name="address_map" readonly="1" force_save="1"/>
                             <field name="latitude" readonly="1" force_save="1"/>
                             <field name="longtitude" readonly="1" force_save="1"/>
                         </group>
-- 
cgit v1.2.3


From 50769e870756dd350421a205e6d49ab555023764 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Sun, 15 Jun 2025 17:33:46 +0700
Subject: <miqdad> fix state view and add ingoing field

---
 indoteknik_custom/views/tukar_guling.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 8fffcbb0..9b490cd0 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -38,6 +38,7 @@
                     <field name="name"/>
                     <field name="date"/>
                     <field name="out_num" string="BU/Out"/>
+                    <field name="in_num" string="BU/In"/>
                     <field name="ba_num" string="Nomor BA"/>
                     <field name="return_type" string="Return Type"/>
                     <field name="state" widget="badge"
@@ -70,8 +71,7 @@
                                 class="btn-secondary"
                                 attrs="{'invisible': [('state', '!=', 'cancel')]}"
                                 confirm="Are you sure you want to reset this record to draft?"/>
-                        <field name="state" widget="statusbar"
-                               statusbar_visible="draft,waiting,done,cancel"/>
+                        <field name="state" widget="statusbar" readonly="1"/>
                     </header>
                     <sheet>
                         <div class="oe_title">
@@ -83,13 +83,19 @@
                         <group>
                             <group>
                                 <field name="date" string="Date" readonly="1"/>
-                                <field name="out_num" string="BU/Out"/>
+                                <field name="out_num" string="BU/Out"
+                                       attrs="{'invisible': [('return_type', 'not in', ['tukar_guling', 'credit_memo', 'revisi_so'])],
+               'required': [('return_type', 'in', ['tukar_guling', 'credit_memo', 'revisi_so'])]}"/>
+
+                                <field name="in_num" string="BU/In"
+                                       attrs="{'invisible': [('return_type', 'not in', ['debit_memo', 'revisi_po'])],
+               'required': [('return_type', 'in', ['debit_memo', 'revisi_po'])]}"/>
                                 <field name="ba_num" string="Nomor BA"/>
                             </group>
                             <group>
                                 <field name="return_type"/>
                                 <field name="notes"/>
-                                <field name="state" readonly="1"/>
+<!--                                <field name="state" readonly="1"/>-->
                             </group>
                         </group>
 
-- 
cgit v1.2.3


From 2f5e84a3f735fd80aa7dad4365db372e872127d7 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 16 Jun 2025 07:55:47 +0700
Subject: <miqdad> tukar guling fill bu/in or bu/out

---
 indoteknik_custom/views/tukar_guling.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 9b490cd0..b3fae602 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -83,13 +83,17 @@
                         <group>
                             <group>
                                 <field name="date" string="Date" readonly="1"/>
-                                <field name="out_num" string="BU/Out"
-                                       attrs="{'invisible': [('return_type', 'not in', ['tukar_guling', 'credit_memo', 'revisi_so'])],
-               'required': [('return_type', 'in', ['tukar_guling', 'credit_memo', 'revisi_so'])]}"/>
-
                                 <field name="in_num" string="BU/In"
-                                       attrs="{'invisible': [('return_type', 'not in', ['debit_memo', 'revisi_po'])],
-               'required': [('return_type', 'in', ['debit_memo', 'revisi_po'])]}"/>
+                                       attrs="{
+           'invisible': [('return_type', 'not in', ['debit_memo', 'revisi_po', 'tukar_guling'])],
+           'required': [('return_type', 'in', ['debit_memo', 'revisi_po'])]
+       }"/>
+
+                                <field name="out_num" string="BU/Out"
+                                       attrs="{
+           'invisible': [('return_type', 'not in', ['revisi_so', 'credit_memo', 'tukar_guling'])],
+           'required': [('return_type', 'in', ['revisi_so', 'credit_memo'])]
+       }"/>
                                 <field name="ba_num" string="Nomor BA"/>
                             </group>
                             <group>
-- 
cgit v1.2.3


From b20b6ada9b13ea40732de14e7ce356f28df40a6b Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Mon, 16 Jun 2025 08:07:03 +0700
Subject: (andri) revisi pesan help pada address_map & nonaktifkan button get
 pin point location sebab GMAPS sudah bisa

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 30b5ca36..2a4b03a7 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -67,9 +67,9 @@
                 </group>
                 <xpath expr="//notebook/page[@name='contact_addresses']" position="before">
                     <page string="Pin Point Location" name="map_location">
-                        <group>
+                        <!-- <group>
                             <button name="geocode_address" type="object" string="Get Pin Point Location" class="btn btn-primary"/>
-                        </group>
+                        </group> -->
                         <div style="margin: 16px 0;">
                             <field name="map_view" widget="googlemap" nolabel="1"/>
                         </div>
-- 
cgit v1.2.3


From 0b6109930666039ed8e12569b6a9de7cbb4ea216 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 16 Jun 2025 08:30:48 +0700
Subject: <miqdad> change view

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index b3fae602..1556adcb 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -83,6 +83,7 @@
                         <group>
                             <group>
                                 <field name="date" string="Date" readonly="1"/>
+                                <field name="return_type"/>
                                 <field name="in_num" string="BU/In"
                                        attrs="{
            'invisible': [('return_type', 'not in', ['debit_memo', 'revisi_po', 'tukar_guling'])],
@@ -94,10 +95,9 @@
            'invisible': [('return_type', 'not in', ['revisi_so', 'credit_memo', 'tukar_guling'])],
            'required': [('return_type', 'in', ['revisi_so', 'credit_memo'])]
        }"/>
-                                <field name="ba_num" string="Nomor BA"/>
                             </group>
                             <group>
-                                <field name="return_type"/>
+                                <field name="ba_num" string="Nomor BA"/>
                                 <field name="notes"/>
 <!--                                <field name="state" readonly="1"/>-->
                             </group>
-- 
cgit v1.2.3


From 2ff882e9f591a25b6b9f5adbd4dd90e7402017a9 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Mon, 16 Jun 2025 08:48:39 +0700
Subject: (andri) comment map view

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 2a4b03a7..7405e27b 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -70,9 +70,9 @@
                         <!-- <group>
                             <button name="geocode_address" type="object" string="Get Pin Point Location" class="btn btn-primary"/>
                         </group> -->
-                        <div style="margin: 16px 0;">
+                        <!-- <div style="margin: 16px 0;">
                             <field name="map_view" widget="googlemap" nolabel="1"/>
-                        </div>
+                        </div> -->
                         <group>
                             <field name="address_map" readonly="1" force_save="1"/>
                             <field name="latitude" readonly="1" force_save="1"/>
-- 
cgit v1.2.3


From 6e2419c226eb74ea5c14d21f441d570829a20021 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Mon, 16 Jun 2025 08:54:56 +0700
Subject: (andri) on map view

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 7405e27b..2a4b03a7 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -70,9 +70,9 @@
                         <!-- <group>
                             <button name="geocode_address" type="object" string="Get Pin Point Location" class="btn btn-primary"/>
                         </group> -->
-                        <!-- <div style="margin: 16px 0;">
+                        <div style="margin: 16px 0;">
                             <field name="map_view" widget="googlemap" nolabel="1"/>
-                        </div> -->
+                        </div>
                         <group>
                             <field name="address_map" readonly="1" force_save="1"/>
                             <field name="latitude" readonly="1" force_save="1"/>
-- 
cgit v1.2.3


From 76de9415681d5fbdd6b9b03e20df88937ec739fc Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Mon, 16 Jun 2025 09:13:05 +0700
Subject: (andri) hapus req shipping option

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 67bf7e76..fbca3705 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -135,7 +135,7 @@
                     <field name="approval_status"/>
                     <field name="sales_tax_id"
                         domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1" />
-                    <field name="select_shipping_option" required="1"/>
+                    <field name="select_shipping_option"/>
                     <field name="carrier_id" required="1" domain="[]" />
                     <field name="delivery_service_type" readonly="1" />
                     <field name="shipping_option_id" />
-- 
cgit v1.2.3


From a0e90200638e26ad06d1caaf2d91d0aeea3ba19d Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Mon, 16 Jun 2025 14:38:40 +0700
Subject: <miqdad> add tukar guling PO and move from inventory

---
 indoteknik_custom/views/tukar_guling.xml    | 196 +++++++++++++---------------
 indoteknik_custom/views/tukar_guling_po.xml | 117 +++++++++++++++++
 2 files changed, 209 insertions(+), 104 deletions(-)
 create mode 100644 indoteknik_custom/views/tukar_guling_po.xml

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 1556adcb..e008d2a1 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -1,127 +1,115 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <data>
-        <!-- Action -->
-        <record id="action_pengajuan_tukar_guling" model="ir.actions.act_window">
-            <field name="name">Pengajuan Tukar Guling</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">tukar.guling</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <!-- Menu -->
-        <menuitem
+	<data>
+		<!-- Action -->
+		<record id="action_pengajuan_tukar_guling" model="ir.actions.act_window">
+			<field name="name">Pengajuan Tukar Guling SO</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">tukar.guling</field>
+			<field name="view_mode">tree,form</field>
+		</record>
+		<!-- Menu -->
+		<menuitem
                 id="menu_pengajuan_tukar_guling"
-                name="Pengajuan Tukar Guling"
-                parent="stock.menu_warehouse_report"
+                name="Pengajuan Tukar Guling SO"
+                parent="sale.sale_order_menu"
                 sequence="3"
                 action="action_pengajuan_tukar_guling"
         />
-
-        <!-- Sequence -->
-        <record id="seq_tukar_guling" model="ir.sequence">
-            <field name="name">Pengajuan Tukar Guling</field>
-            <field name="code">tukar.guling</field>
-            <field name="prefix">PTG/</field>
-            <field name="padding">5</field>
-            <field name="number_next">1</field>
-            <field name="number_increment">1</field>
-            <field name="company_id" eval="False"/>
-        </record>
-
-        <!-- Tree View -->
-        <record id="pengajuan_tukar_guling_tree" model="ir.ui.view">
-            <field name="name">pengajuan.tukar.guling.tree</field>
-            <field name="model">tukar.guling</field>
-            <field name="arch" type="xml">
-                <tree create="1" delete="1" default_order="create_date desc">
-                    <field name="name"/>
-                    <field name="date"/>
-                    <field name="out_num" string="BU/Out"/>
-                    <field name="in_num" string="BU/In"/>
-                    <field name="ba_num" string="Nomor BA"/>
-                    <field name="return_type" string="Return Type"/>
-                    <field name="state" widget="badge"
-                           decoration-info="state in ('draft', 'waiting')"
+		<!-- Sequence -->
+		<record id="seq_tukar_guling" model="ir.sequence">
+			<field name="name">Pengajuan Tukar Guling SO</field>
+			<field name="code">tukar.guling</field>
+			<field name="prefix">PTG/</field>
+			<field name="padding">5</field>
+			<field name="number_next">1</field>
+			<field name="number_increment">1</field>
+			<field name="company_id" eval="False"/>
+		</record>
+		<!-- Tree View -->
+		<record id="pengajuan_tukar_guling_tree" model="ir.ui.view">
+			<field name="name">pengajuan.tukar.guling.tree</field>
+			<field name="model">tukar.guling</field>
+			<field name="arch" type="xml">
+				<tree create="1" delete="1" default_order="create_date desc">
+					<field name="name"/>
+					<field name="date"/>
+					<field name="out_num" string="BU/Out"/>
+					<field name="ba_num" string="Nomor BA"/>
+					<field name="return_type" string="Return Type"/>
+					<field name="state" widget="badge"
+                           decoration-info="state in ('draft', 'approval_sales', 'approval_logistic','approval_finance')"
                            decoration-success="state == 'done'"
                            decoration-muted="state == 'cancel'"
                     />
-                </tree>
-            </field>
-        </record>
-
-        <!-- Form View -->
-        <record id="pengajuan_tukar_guling_form" model="ir.ui.view">
-            <field name="name">pengajuan.tukar.guling.form</field>
-            <field name="model">tukar.guling</field>
-            <field name="arch" type="xml">
-                <form>
-                    <header>
-                        <button name="action_submit" string="Submit" type="object"
+				</tree>
+			</field>
+		</record>
+		<!-- Form View -->
+		<record id="pengajuan_tukar_guling_form" model="ir.ui.view">
+			<field name="name">pengajuan.tukar.guling.form</field>
+			<field name="model">tukar.guling</field>
+			<field name="arch" type="xml">
+				<form>
+					<header>
+						<button name="action_submit" string="Submit" type="object"
                                 class="btn-primary"
                                 attrs="{'invisible': [('state', '!=', 'draft')]}"/>
-                        <button name="action_approve" string="Approve" type="object"
-                                class="btn-primary"
-                                attrs="{'invisible': [('state', '!=', 'waiting')]}"/>
-                        <button name="action_cancel" string="Cancel" type="object"
+						<button name="action_approve" string="Approve" type="object"
+								class="btn-primary"
+								attrs="{'invisible': [('state', 'not in', ['approval_sales', 'approval_logistic', 'approval_finance'])]}"/>
+						<button name="action_cancel" string="Cancel" type="object"
                                 class="btn-secondary"
-                                attrs="{'invisible': [('state', 'in', ('done', 'cancel'))]}"
+								attrs="{'invisible': [('state', '=', 'draft')]}"
                                 confirm="Are you sure you want to cancel this record?"/>
-                        <button name="action_draft" string="Set to Draft" type="object"
+						<button name="action_draft" string="Set to Draft" type="object"
                                 class="btn-secondary"
                                 attrs="{'invisible': [('state', '!=', 'cancel')]}"
                                 confirm="Are you sure you want to reset this record to draft?"/>
-                        <field name="state" widget="statusbar" readonly="1"/>
-                    </header>
-                    <sheet>
-                        <div class="oe_title">
-                            <h1>
-                                <field name="name" readonly="1" class="oe_inline"/>
-                            </h1>
-                            <hr/>
-                        </div>
-                        <group>
-                            <group>
-                                <field name="date" string="Date" readonly="1"/>
-                                <field name="return_type"/>
-                                <field name="in_num" string="BU/In"
-                                       attrs="{
-           'invisible': [('return_type', 'not in', ['debit_memo', 'revisi_po', 'tukar_guling'])],
-           'required': [('return_type', 'in', ['debit_memo', 'revisi_po'])]
-       }"/>
-
-                                <field name="out_num" string="BU/Out"
+						<field name="state" widget="statusbar" readonly="1"
+							   statusbar_visible="draft,approval_sales,approval_logistic,approval_finance,done"/>
+					</header>
+					<sheet>
+						<div class="oe_title">
+							<h1>
+								<field name="name" readonly="1" class="oe_inline"/>
+							</h1>
+							<hr/>
+						</div>
+						<group>
+							<group>
+								<field name="date" string="Date" readonly="1"/>
+								<field name="return_type"/>
+								<field name="out_num" string="BU/Out"
                                        attrs="{
            'invisible': [('return_type', 'not in', ['revisi_so', 'credit_memo', 'tukar_guling'])],
            'required': [('return_type', 'in', ['revisi_so', 'credit_memo'])]
        }"/>
-                            </group>
-                            <group>
-                                <field name="ba_num" string="Nomor BA"/>
-                                <field name="notes"/>
-<!--                                <field name="state" readonly="1"/>-->
-                            </group>
-                        </group>
-
-                        <!-- Product Lines -->
-                        <notebook>
-                            <page string="Product Lines" name="product_lines">
-                                <field name="line_ids">
-                                    <tree string="Product Lines" editable="bottom">
-                                        <field name="sequence" widget="handle"/>
-                                        <field name="product_id" required="1"
+							</group>
+							<group>
+								<field name="ba_num" string="Nomor BA"/>
+								<field name="notes"/>
+							</group>
+						</group>
+						<!-- Product Lines -->
+						<notebook>
+							<page string="Product Lines" name="product_lines">
+								<field name="line_ids">
+									<tree string="Product Lines" editable="bottom">
+										<field name="sequence" widget="handle"/>
+										<field name="product_id" required="1"
                                                options="{'no_create': True, 'no_create_edit': True}"/>
-                                        <field name="name" force_save="1"/>
-                                        <field name="product_uom_qty" string="Quantity"/>
-                                        <field name="product_uom" string="UoM"
+										<field name="name" force_save="1"/>
+										<field name="product_uom_qty" string="Quantity"/>
+										<field name="product_uom" string="UoM"
                                                options="{'no_create': True, 'no_create_edit': True}"/>
-                                    </tree>
-                                </field>
-                            </page>
-                        </notebook>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-    </data>
+									</tree>
+								</field>
+							</page>
+						</notebook>
+					</sheet>
+				</form>
+			</field>
+		</record>
+	</data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/tukar_guling_po.xml b/indoteknik_custom/views/tukar_guling_po.xml
new file mode 100644
index 00000000..840b625b
--- /dev/null
+++ b/indoteknik_custom/views/tukar_guling_po.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+	<data>
+		<!-- Action -->
+		<record id="action_pengajuan_tukar_guling_po" model="ir.actions.act_window">
+			<field name="name">Pengajuan Tukar Guling PO</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">tukar.guling.po</field>
+			<field name="view_mode">tree,form</field>
+		</record>
+
+		<menuitem
+				id="menu_pengajuan_tukar_guling_po"
+				name="Pengajuan Tukar Guling PO"
+				parent="purchase.menu_procurement_management"
+				sequence="4"
+				action="action_pengajuan_tukar_guling_po"
+		/>
+
+		<!-- Sequence -->
+		<record id="seq_tukar_guling_po" model="ir.sequence">
+			<field name="name">Pengajuan Tukar Guling PO</field>
+			<field name="code">tukar.guling.po</field>
+			<field name="prefix">PTGPO/</field>
+			<field name="padding">5</field>
+			<field name="number_next">1</field>
+			<field name="number_increment">1</field>
+			<field name="company_id" eval="False"/>
+		</record>
+
+		<!-- Tree View -->
+		<record id="pengajuan_tukar_guling_po_tree" model="ir.ui.view">
+			<field name="name">pengajuan.tukar.guling.po.tree</field>
+			<field name="model">tukar.guling.po</field>
+			<field name="arch" type="xml">
+				<tree create="1" delete="1" default_order="create_date desc">
+					<field name="name"/>
+					<field name="date"/>
+					<field name="out_num" string="BU/Out"/>
+					<field name="ba_num" string="Nomor BA"/>
+					<field name="return_type" string="Return Type"/>
+					<field name="state" widget="badge"
+						decoration-info="state in ('draft', 'approval_sales', 'approval_logistic','approval_finance')"
+						decoration-success="state == 'done'"
+						decoration-muted="state == 'cancel'"
+					/>
+				</tree>
+			</field>
+		</record>
+
+		<!-- Form View -->
+		<record id="pengajuan_tukar_guling_po_form" model="ir.ui.view">
+			<field name="name">pengajuan.tukar.guling.po.form</field>
+			<field name="model">tukar.guling.po</field>
+			<field name="arch" type="xml">
+				<form>
+					<header>
+						<button name="action_submit" string="Submit" type="object"
+							class="btn-primary"
+							attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+						<button name="action_approve" string="Approve" type="object"
+							class="btn-primary"
+							attrs="{'invisible': [('state', 'not in', ['approval_sales', 'approval_logistic', 'approval_finance'])]}"/>
+						<button name="action_cancel" string="Cancel" type="object"
+							class="btn-secondary"
+							attrs="{'invisible': [('state', '=', 'draft')]}"
+							confirm="Are you sure you want to cancel this record?"/>
+						<button name="action_draft" string="Set to Draft" type="object"
+							class="btn-secondary"
+							attrs="{'invisible': [('state', '!=', 'cancel')]}"
+							confirm="Are you sure you want to reset this record to draft?"/>
+						<field name="state" widget="statusbar" readonly="1"
+							statusbar_visible="draft,approval_sales,approval_logistic,approval_finance,done"/>
+					</header>
+					<sheet>
+						<div class="oe_title">
+							<h1>
+								<field name="name" readonly="1" class="oe_inline"/>
+							</h1>
+							<hr/>
+						</div>
+						<group>
+							<group>
+								<field name="date" string="Date" readonly="1"/>
+								<field name="return_type"/>
+								<field name="out_num" string="BU/Out"
+									attrs="{
+										'invisible': [('return_type', 'not in', ['revisi_po', 'debit_memo', 'tukar_guling'])],
+										'required': [('return_type', 'in', ['revisi_po', 'debit_memo'])]
+									}"/>
+							</group>
+							<group>
+								<field name="ba_num" string="Nomor BA"/>
+								<field name="notes"/>
+							</group>
+						</group>
+						<notebook>
+							<page string="Product Lines" name="product_lines">
+								<field name="line_ids">
+									<tree string="Product Lines" editable="bottom">
+										<field name="sequence" widget="handle"/>
+										<field name="product_id" required="1"
+											options="{'no_create': True, 'no_create_edit': True}"/>
+										<field name="name" force_save="1"/>
+										<field name="product_uom_qty" string="Quantity"/>
+										<field name="product_uom" string="UoM"
+											options="{'no_create': True, 'no_create_edit': True}"/>
+									</tree>
+								</field>
+							</page>
+						</notebook>
+					</sheet>
+				</form>
+			</field>
+		</record>
+	</data>
+</odoo>
-- 
cgit v1.2.3


From abd7da741c6eec02dbefa195b91dbedd70b3323e Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 17 Jun 2025 08:09:57 +0700
Subject: <miqdad> add tukar guling PO and move from inventory

---
 indoteknik_custom/views/tukar_guling_po.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling_po.xml b/indoteknik_custom/views/tukar_guling_po.xml
index 840b625b..3ad269ee 100644
--- a/indoteknik_custom/views/tukar_guling_po.xml
+++ b/indoteknik_custom/views/tukar_guling_po.xml
@@ -40,7 +40,7 @@
 					<field name="ba_num" string="Nomor BA"/>
 					<field name="return_type" string="Return Type"/>
 					<field name="state" widget="badge"
-						decoration-info="state in ('draft', 'approval_sales', 'approval_logistic','approval_finance')"
+						decoration-info="state in ('draft', 'approval_purchase', 'approval_logistic','approval_finance')"
 						decoration-success="state == 'done'"
 						decoration-muted="state == 'cancel'"
 					/>
@@ -60,7 +60,7 @@
 							attrs="{'invisible': [('state', '!=', 'draft')]}"/>
 						<button name="action_approve" string="Approve" type="object"
 							class="btn-primary"
-							attrs="{'invisible': [('state', 'not in', ['approval_sales', 'approval_logistic', 'approval_finance'])]}"/>
+							attrs="{'invisible': [('state', 'not in', ['approval_purchase', 'approval_logistic', 'approval_finance'])]}"/>
 						<button name="action_cancel" string="Cancel" type="object"
 							class="btn-secondary"
 							attrs="{'invisible': [('state', '=', 'draft')]}"
@@ -70,7 +70,7 @@
 							attrs="{'invisible': [('state', '!=', 'cancel')]}"
 							confirm="Are you sure you want to reset this record to draft?"/>
 						<field name="state" widget="statusbar" readonly="1"
-							statusbar_visible="draft,approval_sales,approval_logistic,approval_finance,done"/>
+							statusbar_visible="draft,approval_purchase,approval_logistic,approval_finance,done"/>
 					</header>
 					<sheet>
 						<div class="oe_title">
-- 
cgit v1.2.3


From a80565682063e718fc55c90e4243b9d5b2432285 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 17 Jun 2025 08:47:53 +0700
Subject: (andri) fix load gmaps pada view & edit

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 2a4b03a7..30b5ca36 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -67,9 +67,9 @@
                 </group>
                 <xpath expr="//notebook/page[@name='contact_addresses']" position="before">
                     <page string="Pin Point Location" name="map_location">
-                        <!-- <group>
+                        <group>
                             <button name="geocode_address" type="object" string="Get Pin Point Location" class="btn btn-primary"/>
-                        </group> -->
+                        </group>
                         <div style="margin: 16px 0;">
                             <field name="map_view" widget="googlemap" nolabel="1"/>
                         </div>
-- 
cgit v1.2.3


From b0241e8449224c67cccee154fb25d784d3d36c1c Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 17 Jun 2025 09:54:46 +0700
Subject: (andri) lepas readonly pada shipping SO yang telah di confirm

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index fbca3705..d0442677 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -305,14 +305,12 @@
                 </field>
                 <field name="select_shipping_option" position="attributes">
                     <attribute name="attrs">
-                        {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
-                        ['cancel','draft'])]}
+                        {'readonly': [('state', 'in', ['cancel', 'done'])]}
                     </attribute>
                 </field>
                 <field name="carrier_id" position="attributes">
                     <attribute name="attrs">
-                        {'readonly': [('approval_status', '=', 'approved'), ('state', 'not in',
-                                                                             ['cancel', 'draft'])]}
+                        {'readonly': [('state', 'in', ['cancel', 'done'])]}
                     </attribute>
                 </field>
                 <field name="payment_term_id" position="attributes">
-- 
cgit v1.2.3


From 34d276fe64a92c4a1c75f6fbf8fa961e84c8afc4 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 17 Jun 2025 22:52:39 +0700
Subject: <miqdad> push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index e008d2a1..a3b7ce23 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -70,6 +70,15 @@
 							   statusbar_visible="draft,approval_sales,approval_logistic,approval_finance,done"/>
 					</header>
 					<sheet>
+						<div class="oe_button_box">
+							<button name="action_view_picking"
+									type="object"
+									class="oe_stat_button"
+									icon="fa-truck"
+									attrs="{'invisible': [('picking_ids', '=', False)]}">
+								<field name="picking_ids" widget="statinfo" string="Delivery"/>
+							</button>
+						</div>
 						<div class="oe_title">
 							<h1>
 								<field name="name" readonly="1" class="oe_inline"/>
@@ -80,6 +89,9 @@
 							<group>
 								<field name="date" string="Date" readonly="1"/>
 								<field name="return_type"/>
+								<field name="origin" readonly="1"/>
+								<field name="ort_num" readonly="1"/>
+								<field name="srt_num" readonly="1"/>
 								<field name="out_num" string="BU/Out"
                                        attrs="{
            'invisible': [('return_type', 'not in', ['revisi_so', 'credit_memo', 'tukar_guling'])],
-- 
cgit v1.2.3


From 9990452fede05f89fdd4dcee49735ea6884c687d Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 18 Jun 2025 08:11:02 +0700
Subject: <miqdad> push

---
 indoteknik_custom/views/tukar_guling.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index a3b7ce23..6ea05939 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -89,9 +89,9 @@
 							<group>
 								<field name="date" string="Date" readonly="1"/>
 								<field name="return_type"/>
-								<field name="origin" readonly="1"/>
-								<field name="ort_num" readonly="1"/>
-								<field name="srt_num" readonly="1"/>
+<!--								<field name="origin" readonly="1"/>-->
+<!--								<field name="ort_num" readonly="1"/>-->
+<!--								<field name="srt_num" readonly="1"/>-->
 								<field name="out_num" string="BU/Out"
                                        attrs="{
            'invisible': [('return_type', 'not in', ['revisi_so', 'credit_memo', 'tukar_guling'])],
-- 
cgit v1.2.3


From 2a349bbe7d5317433e339d873bdaa46e9d37ae17 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 18 Jun 2025 08:15:56 +0700
Subject: <miqdad> Add origin SO

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 6ea05939..013fdc24 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -89,7 +89,7 @@
 							<group>
 								<field name="date" string="Date" readonly="1"/>
 								<field name="return_type"/>
-<!--								<field name="origin" readonly="1"/>-->
+								<field name="origin" readonly="1"/>
 <!--								<field name="ort_num" readonly="1"/>-->
 <!--								<field name="srt_num" readonly="1"/>-->
 								<field name="out_num" string="BU/Out"
-- 
cgit v1.2.3


From 968d9987eb53670f0d96209e77debb1196f9b939 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 18 Jun 2025 09:33:37 +0700
Subject: <miqdad> tukar guling so done

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 013fdc24..9f8a6ff6 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -89,7 +89,6 @@
 							<group>
 								<field name="date" string="Date" readonly="1"/>
 								<field name="return_type"/>
-								<field name="origin" readonly="1"/>
 <!--								<field name="ort_num" readonly="1"/>-->
 <!--								<field name="srt_num" readonly="1"/>-->
 								<field name="out_num" string="BU/Out"
@@ -97,6 +96,7 @@
            'invisible': [('return_type', 'not in', ['revisi_so', 'credit_memo', 'tukar_guling'])],
            'required': [('return_type', 'in', ['revisi_so', 'credit_memo'])]
        }"/>
+								<field name="origin" readonly="1"/>
 							</group>
 							<group>
 								<field name="ba_num" string="Nomor BA"/>
-- 
cgit v1.2.3


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')

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 d1ff4bd35deac6c17a17e97f0904f67e113c5add Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 18 Jun 2025 13:32:05 +0700
Subject: <miqdad> revisi, fetch item from bu out in tukar guling line

---
 indoteknik_custom/views/tukar_guling.xml    | 14 +++++++-------
 indoteknik_custom/views/tukar_guling_po.xml |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 9f8a6ff6..c775c301 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -3,7 +3,7 @@
 	<data>
 		<!-- Action -->
 		<record id="action_pengajuan_tukar_guling" model="ir.actions.act_window">
-			<field name="name">Pengajuan Tukar Guling SO</field>
+			<field name="name">Pengajuan Return SO</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="res_model">tukar.guling</field>
 			<field name="view_mode">tree,form</field>
@@ -11,14 +11,14 @@
 		<!-- Menu -->
 		<menuitem
                 id="menu_pengajuan_tukar_guling"
-                name="Pengajuan Tukar Guling SO"
+                name="Pengajuan Return SO"
                 parent="sale.sale_order_menu"
                 sequence="3"
                 action="action_pengajuan_tukar_guling"
         />
 		<!-- Sequence -->
 		<record id="seq_tukar_guling" model="ir.sequence">
-			<field name="name">Pengajuan Tukar Guling SO</field>
+			<field name="name">Pengajuan Return SO</field>
 			<field name="code">tukar.guling</field>
 			<field name="prefix">PTG/</field>
 			<field name="padding">5</field>
@@ -34,7 +34,7 @@
 				<tree create="1" delete="1" default_order="create_date desc">
 					<field name="name"/>
 					<field name="date"/>
-					<field name="out_num" string="BU/Out"/>
+					<field name="operations" string="Operations"/>
 					<field name="ba_num" string="Nomor BA"/>
 					<field name="return_type" string="Return Type"/>
 					<field name="state" widget="badge"
@@ -91,10 +91,10 @@
 								<field name="return_type"/>
 <!--								<field name="ort_num" readonly="1"/>-->
 <!--								<field name="srt_num" readonly="1"/>-->
-								<field name="out_num" string="BU/Out"
+								<field name="operations" string="Operations"
                                        attrs="{
-           'invisible': [('return_type', 'not in', ['revisi_so', 'credit_memo', 'tukar_guling'])],
-           'required': [('return_type', 'in', ['revisi_so', 'credit_memo'])]
+           'invisible': [('return_type', 'not in', ['revisi_so','tukar_guling'])],
+           'required': [('return_type', 'in', ['revisi_so'])]
        }"/>
 								<field name="origin" readonly="1"/>
 							</group>
diff --git a/indoteknik_custom/views/tukar_guling_po.xml b/indoteknik_custom/views/tukar_guling_po.xml
index 3ad269ee..76d85904 100644
--- a/indoteknik_custom/views/tukar_guling_po.xml
+++ b/indoteknik_custom/views/tukar_guling_po.xml
@@ -36,7 +36,7 @@
 				<tree create="1" delete="1" default_order="create_date desc">
 					<field name="name"/>
 					<field name="date"/>
-					<field name="out_num" string="BU/Out"/>
+					<field name="operations" string="BU/Out"/>
 					<field name="ba_num" string="Nomor BA"/>
 					<field name="return_type" string="Return Type"/>
 					<field name="state" widget="badge"
@@ -83,7 +83,7 @@
 							<group>
 								<field name="date" string="Date" readonly="1"/>
 								<field name="return_type"/>
-								<field name="out_num" string="BU/Out"
+								<field name="operations" string="BU/Out"
 									attrs="{
 										'invisible': [('return_type', 'not in', ['revisi_po', 'debit_memo', 'tukar_guling'])],
 										'required': [('return_type', 'in', ['revisi_po', 'debit_memo'])]
-- 
cgit v1.2.3


From 594b0a4ac57480ac750b22a8361afb1045e7ad44 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 18 Jun 2025 16:13:57 +0700
Subject: <miqdad> cannot edit line product only delete

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index c775c301..4cc3495a 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -107,7 +107,7 @@
 						<notebook>
 							<page string="Product Lines" name="product_lines">
 								<field name="line_ids">
-									<tree string="Product Lines" editable="bottom">
+									<tree string="Product Lines" create="0" delete="1" edit="0">
 										<field name="sequence" widget="handle"/>
 										<field name="product_id" required="1"
                                                options="{'no_create': True, 'no_create_edit': True}"/>
-- 
cgit v1.2.3


From 177a0e86577ed705e07f19e880f8a7cfaced7c2a Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 19 Jun 2025 08:05:11 +0700
Subject: <miqdad> cannot edit line product only delete

---
 indoteknik_custom/views/tukar_guling.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 4cc3495a..ce4a6737 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -105,9 +105,9 @@
 						</group>
 						<!-- Product Lines -->
 						<notebook>
-							<page string="Product Lines" name="product_lines">
-								<field name="line_ids">
-									<tree string="Product Lines" create="0" delete="1" edit="0">
+							<page string="Product Lines" name="product_lines" create="0" delete="1" edit="0">
+								<field name="line_ids" readonly="1">
+									<tree string="Product Lines">
 										<field name="sequence" widget="handle"/>
 										<field name="product_id" required="1"
                                                options="{'no_create': True, 'no_create_edit': True}"/>
-- 
cgit v1.2.3


From ff9b0cb54bb2f9c99773cfc7c8c5b612bb5d7444 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 19 Jun 2025 08:45:34 +0700
Subject: <miqdad> rev cannot edit line product only delete

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index ce4a6737..b257000f 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -105,8 +105,8 @@
 						</group>
 						<!-- Product Lines -->
 						<notebook>
-							<page string="Product Lines" name="product_lines" create="0" delete="1" edit="0">
-								<field name="line_ids" readonly="1">
+							<page string="Product Lines" name="product_lines" create="0" edit="0">
+								<field name="line_ids" delete="1">
 									<tree string="Product Lines">
 										<field name="sequence" widget="handle"/>
 										<field name="product_id" required="1"
-- 
cgit v1.2.3


From 89a53c90bfeb735f3f256dfadfd24c5c5a5c6328 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 19 Jun 2025 09:24:39 +0700
Subject: (andri) penambahan ET product leadtime berdasarkan SLA vendor tanpa
 logistik & hari libur

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index d0442677..861006cc 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -144,6 +144,15 @@
                     <field name="date_doc_kirim" readonly="1"/>
                     <field name="notification" readonly="1"/>
                 </field>
+                <xpath expr="//page[@name='other_information']/group/group[@name='sale_reporting']" position="after">
+                    <group string="ETA">
+                        <field name="et_products"/>
+                        <field name="eta_date_reserved"/>
+                        <field name="expected_ready_to_ship"/>
+                        <field name="eta_date_start"/>
+                        <field name="eta_date" readonly="1"/>
+                    </group>
+                </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']"
                        position="attributes">
                     <attribute name="attrs">
-- 
cgit v1.2.3


From c4640e2f846d853412c5f1cb0901e50208fa0216 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 19 Jun 2025 09:33:25 +0700
Subject: (andri) ganti keterangan eta date reserved & penyesuaian field ETA

---
 indoteknik_custom/views/sale_order.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 861006cc..2a159307 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -103,10 +103,10 @@
                     <field name="compute_fullfillment" invisible="1" />
                 </field>
                 <field name="tag_ids" position="after">
-                    <field name="eta_date_start"/>
+                    <!-- <field name="eta_date_start"/> -->
                     <t t-esc="' to '"/>
-                    <field name="eta_date" readonly="1"/>
-                    <field name="expected_ready_to_ship"/>
+                    <!-- <field name="eta_date" readonly="1"/> -->
+                    <!-- <field name="expected_ready_to_ship"/> -->
                      <field name="ready_to_ship_status_detail"/>
                     <field name="flash_sale"/>
                     <field name="margin_after_delivery_purchase"/>
-- 
cgit v1.2.3


From 0367831ed39894eea690a59999722c0d9a248fe4 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Thu, 19 Jun 2025 09:47:59 +0700
Subject: add sj return date on tree stock picking

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 97a9fbed..c088e00c 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -17,6 +17,7 @@
                     <field name="driver_arrival_date" optional="hide"/>
                     <field name="note_logistic" optional="hide"/>
                     <field name="note" optional="hide"/>
+                    <field name="sj_return_date" optional="hide"/>
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
                     <field name="state_packing" widget="badge" decoration-success="state_packing == 'packing_done'" decoration-danger="state_packing == 'not_packing'" optional="hide"/>
-- 
cgit v1.2.3


From 865900d364f3a97586c19290ae458e655ea7f592 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 19 Jun 2025 13:11:04 +0700
Subject: <miqdad> Fix sequence

---
 indoteknik_custom/views/ir_sequence.xml  |  9 +++++++++
 indoteknik_custom/views/tukar_guling.xml | 10 ----------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 97bf40bb..bfee0fd4 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -160,5 +160,14 @@
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
+		<record id="seq_tukar_guling" model="ir.sequence">
+			<field name="name">Pengajuan Return SO</field>
+			<field name="code">tukar.guling</field>
+			<field name="prefix">PTG/</field>
+			<field name="padding">5</field>
+			<field name="number_next">1</field>
+			<field name="number_increment">1</field>
+			<field name="company_id" eval="False"/>
+		</record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index b257000f..765c913d 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -16,16 +16,6 @@
                 sequence="3"
                 action="action_pengajuan_tukar_guling"
         />
-		<!-- Sequence -->
-		<record id="seq_tukar_guling" model="ir.sequence">
-			<field name="name">Pengajuan Return SO</field>
-			<field name="code">tukar.guling</field>
-			<field name="prefix">PTG/</field>
-			<field name="padding">5</field>
-			<field name="number_next">1</field>
-			<field name="number_increment">1</field>
-			<field name="company_id" eval="False"/>
-		</record>
 		<!-- Tree View -->
 		<record id="pengajuan_tukar_guling_tree" model="ir.ui.view">
 			<field name="name">pengajuan.tukar.guling.tree</field>
-- 
cgit v1.2.3


From 9afff443c6d1f489c30f3306cd60e4c97e3cebd1 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 19 Jun 2025 14:00:29 +0700
Subject: (andri) add button related BU di PO yang hasilnya mengarah ke list
 related BU

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 9084bcbb..e4e75bf2 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -27,6 +27,19 @@
                             <t t-esc="record.move_id.name"/>
                         </span>
                     </button>
+                    <button type="object"
+                            name="action_view_related_bu"
+                            class="oe_stat_button"
+                            icon="fa-truck"
+                            style="width: 200px;"
+                            attrs="{'invisible': [('state', 'in', ['draft', 'sent'])]}">
+                        <div class="o_stat_info">
+                            <span class="o_stat_value">
+                                <t t-esc="len(record.picking_ids)"/>
+                            </span>
+                            <span class="o_stat_text">BU Related</span>
+                        </div>
+                    </button>
                 </xpath>
                 <button id="draft_confirm" position="after">
                     <button name="po_approve"
-- 
cgit v1.2.3


From bb8d3f325228936acaad5f8cbdac555fc289b854 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 19 Jun 2025 14:49:03 +0700
Subject: <miqdad> push

---
 indoteknik_custom/views/ir_sequence.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index bfee0fd4..934e9100 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -161,13 +161,20 @@
             <field name="number_increment">1</field>
         </record>
 		<record id="seq_tukar_guling" model="ir.sequence">
-			<field name="name">Pengajuan Return SO</field>
+			<field name="name">Pengajuan Retur Tukar Guling SO</field>
 			<field name="code">tukar.guling</field>
 			<field name="prefix">PTG/</field>
 			<field name="padding">5</field>
 			<field name="number_next">1</field>
 			<field name="number_increment">1</field>
-			<field name="company_id" eval="False"/>
 		</record>
+        <record id="seq_tukar_guling_prs" model="ir.sequence">
+            <field name="name">Pengajuan Retur Revisi SO (PRS)</field>
+            <field name="code">tukar.guling.prs</field>
+            <field name="prefix">PRS-</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 6be435f0321929f2fb696e9bf91b64737f387769 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 19 Jun 2025 15:21:18 +0700
Subject: (andri) add count bu related

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index e4e75bf2..5417e53c 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -33,12 +33,7 @@
                             icon="fa-truck"
                             style="width: 200px;"
                             attrs="{'invisible': [('state', 'in', ['draft', 'sent'])]}">
-                        <div class="o_stat_info">
-                            <span class="o_stat_value">
-                                <t t-esc="len(record.picking_ids)"/>
-                            </span>
-                            <span class="o_stat_text">BU Related</span>
-                        </div>
+                        <field name="bu_related_count" widget="statinfo" string="BU Related"/>
                     </button>
                 </xpath>
                 <button id="draft_confirm" position="after">
-- 
cgit v1.2.3


From 8a0293f9f644c2006182f71c241a78d62b8cc3a7 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 19 Jun 2025 15:27:51 +0700
Subject: (andri) sembunyikan button receipt/picking_count

---
 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 5417e53c..7b568d07 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -35,6 +35,7 @@
                             attrs="{'invisible': [('state', 'in', ['draft', 'sent'])]}">
                         <field name="bu_related_count" widget="statinfo" string="BU Related"/>
                     </button>
+                    <field name="picking_count" invisible="1"/>
                 </xpath>
                 <button id="draft_confirm" position="after">
                     <button name="po_approve"
-- 
cgit v1.2.3


From 3be1e1707547d40f618f70bd18e54519842e95a1 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 19 Jun 2025 16:59:09 +0700
Subject: (andri) fix value PO pada CAB dan Vendor Bill pada MISC

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 0c2f9a68..d2b03b1d 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -37,8 +37,8 @@
                 </field>
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
-                    <!-- <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/> -->
-                    <field name="bill_id" readonly="1"  attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('purchase_order_id', '!=', False)]}"/>
+                    <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/>
+                    <field name="bill_id" readonly="1"/>
                 </field>
                 <field name="partner_shipping_id" position="before">
                     <field name="real_invoice_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
-- 
cgit v1.2.3


From 3097045aef8463edc41e417dfef4b0a6ae1d6bda Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 19 Jun 2025 17:31:44 +0700
Subject: (andri) comment duplicate field PO pada BILL

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index d2b03b1d..0fc62293 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -33,7 +33,7 @@
                 </field>
                 <field name="invoice_date" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
-                    <field name="purchase_order_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"/>
+                    <!-- <field name="purchase_order_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"/> -->
                 </field>
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
-- 
cgit v1.2.3


From f1bd55eed208cc351e7486c556cbdf7b6c94a341 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 20 Jun 2025 08:28:02 +0700
Subject: <miqdad> redirect to pengajuan retur

---
 .../views/tukar_guling_return_views.xml              | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 indoteknik_custom/views/tukar_guling_return_views.xml

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling_return_views.xml b/indoteknik_custom/views/tukar_guling_return_views.xml
new file mode 100644
index 00000000..9312005a
--- /dev/null
+++ b/indoteknik_custom/views/tukar_guling_return_views.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Inherit the return picking form view -->
+    <record id="view_stock_return_picking_form_inherit" model="ir.ui.view">
+        <field name="name">stock.return.picking.form.inherit.tukar.guling</field>
+        <field name="model">stock.return.picking</field>
+        <field name="inherit_id" ref="stock.view_stock_return_picking_form"/>
+        <field name="priority" eval="20"/>  <!-- Higher than stock_account -->
+        <field name="arch" type="xml">
+            <!-- Add fields above the product moves table -->
+            <xpath expr="//field[@name='product_return_moves']" position="before">
+                <div class="row mb-3">
+                    <div class="col-12">
+                        <field name="return_type" class="oe_inline"/>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From bce4d940dc90bf50e045a8fde3fd1c7bb53e8562 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 20 Jun 2025 09:21:19 +0700
Subject: <miqdad> revert

---
 indoteknik_custom/views/ir_sequence.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 934e9100..bfee0fd4 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -161,20 +161,13 @@
             <field name="number_increment">1</field>
         </record>
 		<record id="seq_tukar_guling" model="ir.sequence">
-			<field name="name">Pengajuan Retur Tukar Guling SO</field>
+			<field name="name">Pengajuan Return SO</field>
 			<field name="code">tukar.guling</field>
 			<field name="prefix">PTG/</field>
 			<field name="padding">5</field>
 			<field name="number_next">1</field>
 			<field name="number_increment">1</field>
+			<field name="company_id" eval="False"/>
 		</record>
-        <record id="seq_tukar_guling_prs" model="ir.sequence">
-            <field name="name">Pengajuan Retur Revisi SO (PRS)</field>
-            <field name="code">tukar.guling.prs</field>
-            <field name="prefix">PRS-</field>
-            <field name="padding">5</field>
-            <field name="number_next">1</field>
-            <field name="number_increment">1</field>
-        </record>
     </data>
 </odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 8a3717c34e0968f3f6ddd7d0cc4fb18aeb218bfe Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Fri, 20 Jun 2025 10:04:01 +0700
Subject: (andri) ganti no dokumen yang lama (CC) sesuai dengan commision type
 yang dipilih (RB/FE/CB)

---
 indoteknik_custom/views/ir_sequence.xml | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 97bf40bb..bb8848c4 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -131,7 +131,7 @@
             <field name="number_increment">1</field>
         </record>
 
-        <record id="sequence_commision_customer" model="ir.sequence">
+        <!-- <record id="sequence_commision_customer" model="ir.sequence">
             <field name="name">Customer Commision</field>
             <field name="code">customer.commision</field>
             <field name="active">TRUE</field>
@@ -139,6 +139,36 @@
             <field name="padding">5</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
+        </record> -->
+
+        <record id="sequence_commision_cashback" model="ir.sequence">
+            <field name="name">Customer Commision Cashback</field>
+            <field name="code">customer.commision.cashback</field>
+            <field name="prefix">CB/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="active">True</field>
+        </record>
+
+        <record id="sequence_commision_fee" model="ir.sequence">
+            <field name="name">Customer Commision Fee</field>
+            <field name="code">customer.commision.fee</field>
+            <field name="prefix">FE/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="active">True</field>
+        </record>
+
+        <record id="sequence_commision_rebate" model="ir.sequence">
+            <field name="name">Customer Commision Rebate</field>
+            <field name="code">customer.commision.rebate</field>
+            <field name="prefix">RB/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="active">True</field>
         </record>
 
         <record id="sequence_automatic_purchase" model="ir.sequence">
-- 
cgit v1.2.3


From 6e8591a6bd28c4faafc08eb9c539fe24bdecf419 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Fri, 20 Jun 2025 16:06:00 +0700
Subject: (andri) tracking webhook aktif dan menggantikan peran button
 sebelumnya

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index c088e00c..22e6cf60 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -64,12 +64,12 @@
                             string="Biteship"
                             type="object"
                     />
-                     <button name="action_sync_biteship_tracking"
+                     <!-- <button name="action_sync_biteship_tracking"
                         type="object"
                         string="Lacak dari Biteship"
                         class="btn-primary"
                         attrs="{'invisible': [('biteship_id', '=', False)]}"
-                    />
+                    /> -->
                     <button name="track_envio_shipment"
                             string="Tracking Envio"
                             type="object"
-- 
cgit v1.2.3


From 41b26b7fca60533fe30240d19b972cbe7022f333 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Sat, 21 Jun 2025 09:07:05 +0700
Subject: <miqdad> return oke

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 765c913d..942f085d 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -73,7 +73,6 @@
 							<h1>
 								<field name="name" readonly="1" class="oe_inline"/>
 							</h1>
-							<hr/>
 						</div>
 						<group>
 							<group>
-- 
cgit v1.2.3


From 47f83eefa28e7902c4f91c03ac6cd2f71a56e67d Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 21 Jun 2025 11:02:58 +0700
Subject: (andri) penyesuaian informasi delivery (biteship) pada BU OUT

---
 indoteknik_custom/views/stock_picking.xml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 22e6cf60..5e33e4c7 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -192,19 +192,33 @@
                                 <field name="note_logistic"/>
                                 <field name="note_info"/>
                                 <field name="responsible" />
-                                <field name="carrier_id"/>
+                                <field name="carrier_id" attrs="{'invisible': [('select_shipping_option_so', '=', 'biteship')]}" />
                                 <field name="biteship_id" invisible="1"/>
                                 <field name="out_code" attrs="{'invisible': [['out_code', '=', False]]}"/>
                                 <field name="picking_code" attrs="{'invisible': [['picking_code', '=', False]]}"/>
                                 <field name="picking_code" string="Picking code (akan digenerate ketika sudah di-validate)" attrs="{'invisible': [['picking_code', '!=', False]]}"/>
                                 <field name="driver_departure_date" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/>
                                 <field name="driver_arrival_date"/>
-                                <field name="delivery_tracking_no"/>
+                                <field name="delivery_tracking_no" attrs="{'invisible': [('select_shipping_option_so', '=', 'biteship')]}"/>
                                 <field name="driver_id"/>
                                 <field name='sj_return_date'/>
                                 <field name="sj_documentation" widget="image" />
                                 <field name="paket_documentation" widget="image" />
                             </group>
+                            <!-- Biteship Group -->
+                            <group attrs="{'invisible': [('select_shipping_option_so', '!=', 'biteship')]}">
+                                <field name="delivery_tracking_no" />
+                                <field name="shipping_method_so_id"/>
+                                <field name="shipping_option_so_id"/>
+                                <field name="biteship_shipping_price" readonly="1"/>
+                                <field name="currency_id" invisible="1"/>
+                                <field name="biteship_shipping_status" readonly="1"/>
+                                <field name="biteship_driver_name" readonly="1"/>
+                                <field name="biteship_driver_phone" readonly="1"/>
+                                <field name="biteship_driver_plate_number" readonly="1"/>
+                                <button name="action_open_biteship_tracking" string="Visit Biteship Tracking" type="object"/>
+                            </group>
+
                             <group attrs="{'invisible': [('carrier_id', '!=', 151)]}">
                                 <field name="envio_id" invisible="1"/>
                                 <field name="envio_code"/>
-- 
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')

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 af4ee6eef06a440207c6d16809d06e08057f66f0 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 20 Jun 2025 09:57:29 +0700
Subject: bu pick in purchase order sales match

---
 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 7b568d07..530fd115 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -332,6 +332,7 @@
                     <field name="delivery_amt" optional="hide"/>
                     <field name="margin_deduct" optional="hide"/>
                     <field name="hold_outgoing_so" optional="hide"/>
+                    <field name="bu_pick" optional="hide"/>
                     <field name="margin_so"/>
                 </tree>
             </field>
-- 
cgit v1.2.3


From 0d95dabc04a3f5334168e989705e9a7568130df4 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 24 Jun 2025 08:41:47 +0700
Subject: <miqdad> spesific tf

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 942f085d..7bc783eb 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -12,7 +12,7 @@
 		<menuitem
                 id="menu_pengajuan_tukar_guling"
                 name="Pengajuan Return SO"
-                parent="sale.sale_order_menu"
+                parent="sale.menu_sale_report"
                 sequence="3"
                 action="action_pengajuan_tukar_guling"
         />
-- 
cgit v1.2.3


From 6a913c0025c64903536fa6c9aeda526b609d27e6 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 24 Jun 2025 11:23:36 +0700
Subject: change request coretax down payment

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 0fc62293..e8061862 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -60,6 +60,7 @@
                     <field name="due_extension"/>
                     <field name="counter"/>
                     <field name="nomor_kwitansi"/>
+                    <field name="down_payment"/>
                 </field>
                 <field name="to_check" position="after">
                     <field name="already_paid"/>
-- 
cgit v1.2.3


From e1e281f6f43b9ba22443845484422cd0c5b1fb30 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 24 Jun 2025 12:08:57 +0700
Subject: (andri) penambahan field pada respartner

---
 indoteknik_custom/views/res_partner.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 30b5ca36..6115587b 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -181,6 +181,11 @@
                                 <field name="dokumen_pengiriman_input"/>
                                 <field name="dokumen_invoice"/>
                             </group>
+                    		<group string="Aging Info">
+                                <field name="avg_aging" readonly="1"/>
+                                <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
+                                <field name="payment_history_url" readonly="1" />
+                            </group>
                         </group>
 
                         <!-- Supplier Lines Section -->
-- 
cgit v1.2.3


From 01c70504c6359d305327921a0329e59a269c868c Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 24 Jun 2025 13:32:02 +0700
Subject: (andri) add field di respartner

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 6115587b..ca48acf3 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -181,11 +181,11 @@
                                 <field name="dokumen_pengiriman_input"/>
                                 <field name="dokumen_invoice"/>
                             </group>
-                    		<group string="Aging Info">
+                    		<!-- <group string="Aging Info">
                                 <field name="avg_aging" readonly="1"/>
                                 <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
                                 <field name="payment_history_url" readonly="1" />
-                            </group>
+                            </group> -->
                         </group>
 
                         <!-- Supplier Lines Section -->
-- 
cgit v1.2.3


From c60fa8f74b019b677d8e9ce513bcd7875a9b00de Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 24 Jun 2025 13:34:37 +0700
Subject: (andri) add field pada view

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index ca48acf3..6115587b 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -181,11 +181,11 @@
                                 <field name="dokumen_pengiriman_input"/>
                                 <field name="dokumen_invoice"/>
                             </group>
-                    		<!-- <group string="Aging Info">
+                    		<group string="Aging Info">
                                 <field name="avg_aging" readonly="1"/>
                                 <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
                                 <field name="payment_history_url" readonly="1" />
-                            </group> -->
+                            </group>
                         </group>
 
                         <!-- Supplier Lines Section -->
-- 
cgit v1.2.3


From 9bc5f5c347b3e8f4d739d615e6a858b25c98e78c Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 25 Jun 2025 08:32:05 +0700
Subject: (andri) fix

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 6115587b..2ed37caf 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -182,10 +182,10 @@
                                 <field name="dokumen_invoice"/>
                             </group>
                     		<group string="Aging Info">
-                                <field name="avg_aging" readonly="1"/>
+                                <!-- <field name="avg_aging" readonly="1"/>
                                 <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
                                 <field name="payment_history_url" readonly="1" />
-                            </group>
+                            </group> -->
                         </group>
 
                         <!-- Supplier Lines Section -->
-- 
cgit v1.2.3


From 01a2063093951e1125d86dc9b8794e591df07a06 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 25 Jun 2025 08:32:25 +0700
Subject: (andri) fix

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 2ed37caf..a851385f 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -181,7 +181,7 @@
                                 <field name="dokumen_pengiriman_input"/>
                                 <field name="dokumen_invoice"/>
                             </group>
-                    		<group string="Aging Info">
+                    		<!-- <group string="Aging Info"> -->
                                 <!-- <field name="avg_aging" readonly="1"/>
                                 <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
                                 <field name="payment_history_url" readonly="1" />
-- 
cgit v1.2.3


From 551d22a1dad24b60e5e1117c70d008dd2eab454d Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 25 Jun 2025 09:11:22 +0700
Subject: (andri) fix view

---
 indoteknik_custom/views/res_partner.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index a851385f..6115587b 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -181,11 +181,11 @@
                                 <field name="dokumen_pengiriman_input"/>
                                 <field name="dokumen_invoice"/>
                             </group>
-                    		<!-- <group string="Aging Info"> -->
-                                <!-- <field name="avg_aging" readonly="1"/>
+                    		<group string="Aging Info">
+                                <field name="avg_aging" readonly="1"/>
                                 <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
                                 <field name="payment_history_url" readonly="1" />
-                            </group> -->
+                            </group>
                         </group>
 
                         <!-- Supplier Lines Section -->
-- 
cgit v1.2.3


From 3c43b91173cdaf5762e2f39197a89a2b24090458 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 25 Jun 2025 10:47:17 +0700
Subject: (andri) fix peletakan field pada view billreklas

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index e8061862..ad52a74a 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -37,6 +37,8 @@
                 </field>
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
+                </field>
+                <field name="reklas_misc_id" position="after">
                     <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/>
                     <field name="bill_id" readonly="1"/>
                 </field>
-- 
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')

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 3b6b3a2f7a161a08fa3995906f92019cc5ea4d17 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 26 Jun 2025 10:32:15 +0700
Subject: <miqdad> don

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 7bc783eb..9d281986 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -95,7 +95,7 @@
 						<!-- Product Lines -->
 						<notebook>
 							<page string="Product Lines" name="product_lines" create="0" edit="0">
-								<field name="line_ids" delete="1">
+								<field name="line_ids" delete="1" readonly="1">
 									<tree string="Product Lines">
 										<field name="sequence" widget="handle"/>
 										<field name="product_id" required="1"
-- 
cgit v1.2.3


From 1e01a6845781821fcf65a42c4528b3efe144e28c Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 26 Jun 2025 15:23:24 +0700
Subject: <miqdad> show bu pick where the bu out is not done

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 9d281986..633f1da4 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -86,6 +86,7 @@
            'required': [('return_type', 'in', ['revisi_so'])]
        }"/>
 								<field name="origin" readonly="1"/>
+<!--								<field name="origin_so" readonly="1"/>-->
 							</group>
 							<group>
 								<field name="ba_num" string="Nomor BA"/>
-- 
cgit v1.2.3


From 0e2fe03295f96560500c53ee61104a0a9f563576 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 27 Jun 2025 15:53:11 +0700
Subject: <miqdad> remove ask return in stock picking

---
 indoteknik_custom/views/stock_picking.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index c088e00c..f4159b1b 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -50,11 +50,11 @@
                             type="object"
                             attrs="{'invisible': ['|', ('state', 'in', ['done']), ('approval_receipt_status', '=', 'pengajuan1')]}"
                     />
-                    <button name="ask_return_approval"
-                            string="Ask Return/Acc"
-                            type="object"
-                            attrs="{'invisible': [('state', 'in', ['draft', 'cancel', 'assigned'])]}"
-                    />
+<!--                    <button name="ask_return_approval"-->
+<!--                            string="Ask Return/Acc"-->
+<!--                            type="object"-->
+<!--                            attrs="{'invisible': [('state', 'in', ['draft', 'cancel', 'assigned'])]}"-->
+<!--                    />-->
                     <button name="action_create_invoice_from_mr"
                             string="Create Bill"
                             type="object"
-- 
cgit v1.2.3


From 400294f6b19bfec07849c5dea8e6d2ea9086c3d1 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 1 Jul 2025 09:39:11 +0700
Subject: <miqdad> change sequence name

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 4bb114eb..0b79864d 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -193,7 +193,7 @@
 		<record id="seq_tukar_guling" model="ir.sequence">
 			<field name="name">Pengajuan Return SO</field>
 			<field name="code">tukar.guling</field>
-			<field name="prefix">PTG/</field>
+			<field name="prefix">CCM/</field>
 			<field name="padding">5</field>
 			<field name="number_next">1</field>
 			<field name="number_increment">1</field>
-- 
cgit v1.2.3


From 4410e0c67fbf95c0663a953c14c241ffa5ddc470 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 1 Jul 2025 09:49:08 +0700
Subject: <miqdad> change sequence name

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 0b79864d..2868f79d 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -197,7 +197,6 @@
 			<field name="padding">5</field>
 			<field name="number_next">1</field>
 			<field name="number_increment">1</field>
-			<field name="company_id" eval="False"/>
 		</record>
     </data>
 </odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 498b7f73857189d1b22204c3f71f35d03ec4afb7 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 1 Jul 2025 09:36:21 +0700
Subject: add sale order on po bom and add bom on po bom

---
 indoteknik_custom/views/mrp_production.xml | 2 +-
 indoteknik_custom/views/purchase_order.xml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/mrp_production.xml b/indoteknik_custom/views/mrp_production.xml
index 3de52a08..5057415f 100644
--- a/indoteknik_custom/views/mrp_production.xml
+++ b/indoteknik_custom/views/mrp_production.xml
@@ -11,7 +11,7 @@
             <field name="bom_id" position="after">
                 <field name="desc"/>
                 <field name="sale_order"/>
-                <field name="is_po"/>
+                <field name="is_po" readonly="1"/>
             </field>
             <xpath expr="//form/sheet/notebook/page/field[@name='move_raw_ids']/tree/field[@name='product_uom_qty']" position="before">
                 <field name="vendor_id"/>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 530fd115..dae23eed 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -87,7 +87,8 @@
                     <field name="payment_term_id"/>
                     <field name="total_cost_service" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
                     <field name="total_delivery_amt" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
-                    <field name="product_bom_id"/>
+                    <field name="product_bom_id" attrs="{'invisible': [('product_bom_id', '=', None)]}"/>
+                    <field name="manufacturing_id" attrs="{'invisible': [('product_bom_id', '=', None)]}"/>
                     <!-- <field name="move_id" domain="[('move_type','=','entry')]" context="{'form_view_ref': 'account.view_move_form'}" options="{'no_create': True}"/> -->
                 </field>
                 <field name="amount_total" position="after">
-- 
cgit v1.2.3


From f1f2b012ed156213a623858cb3fb816e6a795f3c Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 2 Jul 2025 10:20:27 +0700
Subject: (andri) fix pay diff

---
 indoteknik_custom/views/res_partner.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 6115587b..ac4d0364 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -108,6 +108,13 @@
                 <xpath expr="//field[@name='property_supplier_payment_term_id']" position="attributes">
                     <attribute name="readonly">1</attribute>
                 </xpath>
+                <xpath expr="//notebook/page[@name='accounting']" position="inside">
+                    <group string="Aging Info">
+                        <field name="avg_aging" readonly="1"/>
+                        <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
+                        <field name="payment_history_url" readonly="1" />
+                    </group>
+                </xpath>
                 <notebook>
                     <page string="Pengajuan Tempo">
                         <!-- Informasi Usaha Section -->
@@ -181,11 +188,11 @@
                                 <field name="dokumen_pengiriman_input"/>
                                 <field name="dokumen_invoice"/>
                             </group>
-                    		<group string="Aging Info">
+                    		<!-- <group string="Aging Info">
                                 <field name="avg_aging" readonly="1"/>
                                 <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
                                 <field name="payment_history_url" readonly="1" />
-                            </group>
+                            </group> -->
                         </group>
 
                         <!-- Supplier Lines Section -->
-- 
cgit v1.2.3


From de50bcf16b21abf7b8e45fb59b366c594bc00038 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 3 Jul 2025 19:55:49 +0700
Subject: <miqdad> start tukar guling po

---
 indoteknik_custom/views/ir_sequence.xml     |  8 +++
 indoteknik_custom/views/tukar_guling.xml    | 49 ++++++++--------
 indoteknik_custom/views/tukar_guling_po.xml | 87 ++++++++++++++---------------
 3 files changed, 75 insertions(+), 69 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 2868f79d..17c9dd8c 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -198,5 +198,13 @@
 			<field name="number_next">1</field>
 			<field name="number_increment">1</field>
 		</record>
+        <record id="seq_tukar_guling" model="ir.sequence">
+            <field name="name">Pengajuan Return PO</field>
+            <field name="code">tukar.guling.po</field>
+            <field name="prefix">CCM-po/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 633f1da4..01721b43 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -10,12 +10,12 @@
 		</record>
 		<!-- Menu -->
 		<menuitem
-                id="menu_pengajuan_tukar_guling"
-                name="Pengajuan Return SO"
-                parent="sale.menu_sale_report"
-                sequence="3"
-                action="action_pengajuan_tukar_guling"
-        />
+				id="menu_pengajuan_tukar_guling"
+				name="Pengajuan Return SO"
+				parent="sale.menu_sale_report"
+				sequence="3"
+				action="action_pengajuan_tukar_guling"
+		/>
 		<!-- Tree View -->
 		<record id="pengajuan_tukar_guling_tree" model="ir.ui.view">
 			<field name="name">pengajuan.tukar.guling.tree</field>
@@ -28,10 +28,10 @@
 					<field name="ba_num" string="Nomor BA"/>
 					<field name="return_type" string="Return Type"/>
 					<field name="state" widget="badge"
-                           decoration-info="state in ('draft', 'approval_sales', 'approval_logistic','approval_finance')"
-                           decoration-success="state == 'done'"
-                           decoration-muted="state == 'cancel'"
-                    />
+						   decoration-info="state in ('draft', 'approval_sales', 'approval_logistic','approval_finance')"
+						   decoration-success="state == 'done'"
+						   decoration-muted="state == 'cancel'"
+					/>
 				</tree>
 			</field>
 		</record>
@@ -43,19 +43,19 @@
 				<form>
 					<header>
 						<button name="action_submit" string="Submit" type="object"
-                                class="btn-primary"
-                                attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+								class="btn-primary"
+								attrs="{'invisible': [('state', '!=', 'draft')]}"/>
 						<button name="action_approve" string="Approve" type="object"
 								class="btn-primary"
 								attrs="{'invisible': [('state', 'not in', ['approval_sales', 'approval_logistic', 'approval_finance'])]}"/>
 						<button name="action_cancel" string="Cancel" type="object"
-                                class="btn-secondary"
+								class="btn-secondary"
 								attrs="{'invisible': [('state', '=', 'draft')]}"
-                                confirm="Are you sure you want to cancel this record?"/>
+								confirm="Are you sure you want to cancel this record?"/>
 						<button name="action_draft" string="Set to Draft" type="object"
-                                class="btn-secondary"
-                                attrs="{'invisible': [('state', '!=', 'cancel')]}"
-                                confirm="Are you sure you want to reset this record to draft?"/>
+								class="btn-secondary"
+								attrs="{'invisible': [('state', '!=', 'cancel')]}"
+								confirm="Are you sure you want to reset this record to draft?"/>
 						<field name="state" widget="statusbar" readonly="1"
 							   statusbar_visible="draft,approval_sales,approval_logistic,approval_finance,done"/>
 					</header>
@@ -78,15 +78,14 @@
 							<group>
 								<field name="date" string="Date" readonly="1"/>
 								<field name="return_type"/>
-<!--								<field name="ort_num" readonly="1"/>-->
-<!--								<field name="srt_num" readonly="1"/>-->
+								<!--								<field name="ort_num" readonly="1"/>-->
+								<!--								<field name="srt_num" readonly="1"/>-->
 								<field name="operations" string="Operations"
-                                       attrs="{
-           'invisible': [('return_type', 'not in', ['revisi_so','tukar_guling'])],
-           'required': [('return_type', 'in', ['revisi_so'])]
+									   attrs="{
+           'required': [('return_type', 'in', ['revisi_so', 'tukar_guling'])]
        }"/>
 								<field name="origin" readonly="1"/>
-<!--								<field name="origin_so" readonly="1"/>-->
+								<!--								<field name="origin_so" readonly="1"/>-->
 							</group>
 							<group>
 								<field name="ba_num" string="Nomor BA"/>
@@ -100,11 +99,11 @@
 									<tree string="Product Lines">
 										<field name="sequence" widget="handle"/>
 										<field name="product_id" required="1"
-                                               options="{'no_create': True, 'no_create_edit': True}"/>
+											   options="{'no_create': True, 'no_create_edit': True}"/>
 										<field name="name" force_save="1"/>
 										<field name="product_uom_qty" string="Quantity"/>
 										<field name="product_uom" string="UoM"
-                                               options="{'no_create': True, 'no_create_edit': True}"/>
+											   options="{'no_create': True, 'no_create_edit': True}"/>
 									</tree>
 								</field>
 							</page>
diff --git a/indoteknik_custom/views/tukar_guling_po.xml b/indoteknik_custom/views/tukar_guling_po.xml
index 76d85904..6e13eee2 100644
--- a/indoteknik_custom/views/tukar_guling_po.xml
+++ b/indoteknik_custom/views/tukar_guling_po.xml
@@ -3,31 +3,19 @@
 	<data>
 		<!-- Action -->
 		<record id="action_pengajuan_tukar_guling_po" model="ir.actions.act_window">
-			<field name="name">Pengajuan Tukar Guling PO</field>
+			<field name="name">Pengajuan Return PO</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="res_model">tukar.guling.po</field>
 			<field name="view_mode">tree,form</field>
 		</record>
-
+		<!-- Menu -->
 		<menuitem
 				id="menu_pengajuan_tukar_guling_po"
-				name="Pengajuan Tukar Guling PO"
+				name="Pengajuan Return PO"
 				parent="purchase.menu_procurement_management"
-				sequence="4"
+				sequence="3"
 				action="action_pengajuan_tukar_guling_po"
 		/>
-
-		<!-- Sequence -->
-		<record id="seq_tukar_guling_po" model="ir.sequence">
-			<field name="name">Pengajuan Tukar Guling PO</field>
-			<field name="code">tukar.guling.po</field>
-			<field name="prefix">PTGPO/</field>
-			<field name="padding">5</field>
-			<field name="number_next">1</field>
-			<field name="number_increment">1</field>
-			<field name="company_id" eval="False"/>
-		</record>
-
 		<!-- Tree View -->
 		<record id="pengajuan_tukar_guling_po_tree" model="ir.ui.view">
 			<field name="name">pengajuan.tukar.guling.po.tree</field>
@@ -36,18 +24,17 @@
 				<tree create="1" delete="1" default_order="create_date desc">
 					<field name="name"/>
 					<field name="date"/>
-					<field name="operations" string="BU/Out"/>
+					<field name="operations" string="Operations"/>
 					<field name="ba_num" string="Nomor BA"/>
 					<field name="return_type" string="Return Type"/>
 					<field name="state" widget="badge"
-						decoration-info="state in ('draft', 'approval_purchase', 'approval_logistic','approval_finance')"
-						decoration-success="state == 'done'"
-						decoration-muted="state == 'cancel'"
+						   decoration-info="state in ('draft', 'approval_purchase', 'approval_logistic','approval_finance')"
+						   decoration-success="state == 'done'"
+						   decoration-muted="state == 'cancel'"
 					/>
 				</tree>
 			</field>
 		</record>
-
 		<!-- Form View -->
 		<record id="pengajuan_tukar_guling_po_form" model="ir.ui.view">
 			<field name="name">pengajuan.tukar.guling.po.form</field>
@@ -56,55 +43,67 @@
 				<form>
 					<header>
 						<button name="action_submit" string="Submit" type="object"
-							class="btn-primary"
-							attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+								class="btn-primary"
+								attrs="{'invisible': [('state', '!=', 'draft')]}"/>
 						<button name="action_approve" string="Approve" type="object"
-							class="btn-primary"
-							attrs="{'invisible': [('state', 'not in', ['approval_purchase', 'approval_logistic', 'approval_finance'])]}"/>
+								class="btn-primary"
+								attrs="{'invisible': [('state', 'not in', ['approval_purchase', 'approval_logistic', 'approval_finance'])]}"/>
 						<button name="action_cancel" string="Cancel" type="object"
-							class="btn-secondary"
-							attrs="{'invisible': [('state', '=', 'draft')]}"
-							confirm="Are you sure you want to cancel this record?"/>
+								class="btn-secondary"
+								attrs="{'invisible': [('state', '=', 'draft')]}"
+								confirm="Are you sure you want to cancel this record?"/>
 						<button name="action_draft" string="Set to Draft" type="object"
-							class="btn-secondary"
-							attrs="{'invisible': [('state', '!=', 'cancel')]}"
-							confirm="Are you sure you want to reset this record to draft?"/>
+								class="btn-secondary"
+								attrs="{'invisible': [('state', '!=', 'cancel')]}"
+								confirm="Are you sure you want to reset this record to draft?"/>
 						<field name="state" widget="statusbar" readonly="1"
-							statusbar_visible="draft,approval_purchase,approval_logistic,approval_finance,done"/>
+							   statusbar_visible="draft,approval_purchase,approval_logistic,approval_finance,done"/>
 					</header>
 					<sheet>
+						<div class="oe_button_box">
+							<button name="action_view_picking"
+									type="object"
+									class="oe_stat_button"
+									icon="fa-truck"
+									attrs="{'invisible': [('po_picking_ids', '=', False)]}">
+								<field name="po_picking_ids" widget="statinfo" string="Delivery"/>
+							</button>
+						</div>
 						<div class="oe_title">
 							<h1>
 								<field name="name" readonly="1" class="oe_inline"/>
 							</h1>
-							<hr/>
 						</div>
 						<group>
 							<group>
 								<field name="date" string="Date" readonly="1"/>
 								<field name="return_type"/>
-								<field name="operations" string="BU/Out"
-									attrs="{
-										'invisible': [('return_type', 'not in', ['revisi_po', 'debit_memo', 'tukar_guling'])],
-										'required': [('return_type', 'in', ['revisi_po', 'debit_memo'])]
-									}"/>
+								<!--								<field name="ort_num" readonly="1"/>-->
+								<!--								<field name="srt_num" readonly="1"/>-->
+								<field name="operations" string="Operations"
+									   attrs="{
+           'required': [('return_type', 'in', ['revisi_po', 'tukar_guling'])]
+       }"/>
+								<field name="origin" readonly="1"/>
+								<!--								<field name="origin_so" readonly="1"/>-->
 							</group>
 							<group>
 								<field name="ba_num" string="Nomor BA"/>
 								<field name="notes"/>
 							</group>
 						</group>
+						<!-- Product Lines -->
 						<notebook>
-							<page string="Product Lines" name="product_lines">
-								<field name="line_ids">
-									<tree string="Product Lines" editable="bottom">
+							<page string="Product Lines" name="product_lines" create="0" edit="0">
+								<field name="line_ids" delete="1" readonly="1">
+									<tree string="Product Lines">
 										<field name="sequence" widget="handle"/>
 										<field name="product_id" required="1"
-											options="{'no_create': True, 'no_create_edit': True}"/>
+											   options="{'no_create': True, 'no_create_edit': True}"/>
 										<field name="name" force_save="1"/>
 										<field name="product_uom_qty" string="Quantity"/>
 										<field name="product_uom" string="UoM"
-											options="{'no_create': True, 'no_create_edit': True}"/>
+											   options="{'no_create': True, 'no_create_edit': True}"/>
 									</tree>
 								</field>
 							</page>
@@ -114,4 +113,4 @@
 			</field>
 		</record>
 	</data>
-</odoo>
+</odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 38ba3d7f5b59a4444d9eb953a6c83e4ab6015ba6 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 4 Jul 2025 09:18:50 +0700
Subject: approval payment term

---
 indoteknik_custom/views/account_move.xml          |  1 +
 indoteknik_custom/views/approval_payment_term.xml | 74 +++++++++++++++++++++++
 indoteknik_custom/views/ir_sequence.xml           | 10 +++
 3 files changed, 85 insertions(+)
 create mode 100644 indoteknik_custom/views/approval_payment_term.xml

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index ad52a74a..2f52b3d9 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -70,6 +70,7 @@
                     <field name="so_shipping_covered_by"/>
                     <field name="so_delivery_amt"/>
                     <field name="flag_delivery_amt"/>
+                    <field name="length_of_payment"/>
                 </field>
                 <field name="amount_untaxed" position="after">
                     <field name="other_subtotal" invisible="1"/>
diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
new file mode 100644
index 00000000..87c77385
--- /dev/null
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="approval_payment_term_tree" model="ir.ui.view">
+        <field name="name">approval.payment.term.tree</field>
+        <field name="model">approval.payment.term</field>
+        <field name="arch" type="xml">
+            <tree default_order="create_date desc">
+                <field name="number"/>
+                <field name="partner_id"/>
+                <field name="parent_id"/>
+                <field name="property_payment_term_id"/>
+                <field name="approve_date" optional="hide"/>
+                <field name="approve_sales_manager" optional="hide"/>
+                <field name="approve_finance" optional="hide"/>
+                <field name="approve_leader" optional="hide"/>
+                <field name="create_uid" optional="hide"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="approval_payment_term_form" model="ir.ui.view">
+        <field name="name">approval.payment.term.form</field>
+        <field name="model">approval.payment.term</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <button name="button_approve"
+                    string="Approve"
+                    type="object"
+                    attrs="{'invisible': [('approve_leader', '=', True)]}"
+                />
+                </header>
+                <sheet string="Approval Payment Term">
+                    <group>
+                        <group>
+                            <field name="number" readonly="1"/>
+                            <field name="partner_id"/>
+                            <field name="parent_id" readonly="1"/>
+                            <field name="blocking_stage" attrs="{'readonly': [('number', '=', False)]}"/>
+                            <field name="warning_stage" attrs="{'readonly': [('number', '=', False)]}"/>
+                            <field name="property_payment_term_id" attrs="{'readonly': [('number', '=', False)]}"/>
+                            <field name="active_limit" attrs="{'readonly': [('number', '=', False)]}"/>
+                        </group>
+                        <group>
+                            <field name="reason"/>
+                            <field name="approve_date" readonly="1"/>
+                            <field name="approve_sales_manager" readonly="1"/>
+                            <field name="approve_finance" readonly="1"/>
+                            <field name="approve_leader" readonly="1"/>
+                        </group>
+                    </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>
+
+    <record id="approval_payment_term_action" model="ir.actions.act_window">
+        <field name="name">Approval Payment Term</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">approval.payment.term</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_approval_payment_term" name="Approval Payment Term"
+        parent="account.menu_finance_receivables"
+        action="approval_payment_term_action" 
+        sequence="100"
+    />
+
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index bb8848c4..a0f5fc6b 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -150,6 +150,16 @@
             <field name="number_increment">1</field>
             <field name="active">True</field>
         </record>
+        
+        <record id="sequence_approval_payment_term" model="ir.sequence">
+            <field name="name">Approval Payment Term</field>
+            <field name="code">approval.payment.term</field>
+            <field name="prefix">APP/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="active">True</field>
+        </record>
 
         <record id="sequence_commision_fee" model="ir.sequence">
             <field name="name">Customer Commision Fee</field>
-- 
cgit v1.2.3


From 1118c1c0762ff0ad98bb8d6e64467b32635dadea Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 4 Jul 2025 09:31:57 +0700
Subject: <miqdad> tukar guling sequence

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 17c9dd8c..3cc43c05 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -201,7 +201,7 @@
         <record id="seq_tukar_guling" model="ir.sequence">
             <field name="name">Pengajuan Return PO</field>
             <field name="code">tukar.guling.po</field>
-            <field name="prefix">CCM-po/</field>
+            <field name="prefix">VCM</field>
             <field name="padding">5</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
-- 
cgit v1.2.3


From f316cfaaf269cf57488bbfae027df95f83a6ec28 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Sat, 5 Jul 2025 08:40:34 +0700
Subject: <miqdad> fix sequence and return

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 3cc43c05..b02e927a 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -198,7 +198,7 @@
 			<field name="number_next">1</field>
 			<field name="number_increment">1</field>
 		</record>
-        <record id="seq_tukar_guling" model="ir.sequence">
+        <record id="seq_tukar_guling_po" model="ir.sequence">
             <field name="name">Pengajuan Return PO</field>
             <field name="code">tukar.guling.po</field>
             <field name="prefix">VCM</field>
-- 
cgit v1.2.3


From 54633b0db570e5811874f78a9515065b9cb41ad8 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Mon, 7 Jul 2025 08:26:38 +0700
Subject: (andri) payment diff res partner no compute

---
 indoteknik_custom/views/res_partner.xml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index ac4d0364..0a2c0377 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -108,13 +108,6 @@
                 <xpath expr="//field[@name='property_supplier_payment_term_id']" position="attributes">
                     <attribute name="readonly">1</attribute>
                 </xpath>
-                <xpath expr="//notebook/page[@name='accounting']" position="inside">
-                    <group string="Aging Info">
-                        <field name="avg_aging" readonly="1"/>
-                        <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
-                        <field name="payment_history_url" readonly="1" />
-                    </group>
-                </xpath>
                 <notebook>
                     <page string="Pengajuan Tempo">
                         <!-- Informasi Usaha Section -->
@@ -188,11 +181,6 @@
                                 <field name="dokumen_pengiriman_input"/>
                                 <field name="dokumen_invoice"/>
                             </group>
-                    		<!-- <group string="Aging Info">
-                                <field name="avg_aging" readonly="1"/>
-                                <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
-                                <field name="payment_history_url" readonly="1" />
-                            </group> -->
                         </group>
 
                         <!-- Supplier Lines Section -->
@@ -225,6 +213,13 @@
                             <field name="dokumen_ktp_dirut"  />
                         </group>
                     </page>
+                    <page string="Aging Info">
+                        <group string="Aging Info">
+                            <field name="avg_aging" readonly="1"/>
+                            <field name="payment_diff" attrs="{'readonly': [('parent_id', '!=', False)]}" />
+                            <field name="payment_history_url" readonly="1" />
+                        </group>
+                    </page>
                 </notebook>
             </field>
         </record>
-- 
cgit v1.2.3


From 05879e52666f02c117aee569621556db97ef345c Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 8 Jul 2025 09:11:11 +0700
Subject: add statusbar and fix bug

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index 87c77385..44bd99f8 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -29,6 +29,14 @@
                     type="object"
                     attrs="{'invisible': [('approve_leader', '=', True)]}"
                 />
+                    <button name="button_reject"
+                    string="Reject"
+                    type="object"
+                    attrs="{'invisible': [('approve_leader', '=', True)]}"
+                />
+                <field name="state" widget="statusbar"
+                       statusbar_visible="waiting_approval,approved,rejected"
+                       statusbar_colors='{"rejected":"red"}'/>
                 </header>
                 <sheet string="Approval Payment Term">
                     <group>
@@ -43,6 +51,7 @@
                         </group>
                         <group>
                             <field name="reason"/>
+                            <field name="reason_reject" attrs="{'invisible': [('state', '!=', 'rejected')]}"/>
                             <field name="approve_date" readonly="1"/>
                             <field name="approve_sales_manager" readonly="1"/>
                             <field name="approve_finance" readonly="1"/>
-- 
cgit v1.2.3


From 347e5e070592e7517b90160d666ce41ddff10347 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 8 Jul 2025 09:14:45 +0700
Subject: (andri) fix

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 0a2c0377..a030a75c 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -216,7 +216,7 @@
                     <page string="Aging Info">
                         <group string="Aging Info">
                             <field name="avg_aging" readonly="1"/>
-                            <field name="payment_diff" attrs="{'readonly': [('parent_id', '!=', False)]}" />
+                            <field name="payment_difficulty" attrs="{'readonly': [('parent_id', '!=', False)]}" />
                             <field name="payment_history_url" readonly="1" />
                         </group>
                     </page>
-- 
cgit v1.2.3


From 1ed9ce9ab59c12fa378cfab02f8919e08f424853 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 8 Jul 2025 09:31:01 +0700
Subject: <miqdad> rev 77

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 01721b43..dc5abec7 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -50,7 +50,7 @@
 								attrs="{'invisible': [('state', 'not in', ['approval_sales', 'approval_logistic', 'approval_finance'])]}"/>
 						<button name="action_cancel" string="Cancel" type="object"
 								class="btn-secondary"
-								attrs="{'invisible': [('state', '=', 'draft')]}"
+								attrs="{'invisible': [('state', 'in', ['draft', 'cancel'])]}"
 								confirm="Are you sure you want to cancel this record?"/>
 						<button name="action_draft" string="Set to Draft" type="object"
 								class="btn-secondary"
-- 
cgit v1.2.3


From a8886eb056d62ace630f15fb3eaa5d55a360b277 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 8 Jul 2025 10:16:46 +0700
Subject: <miqdad> rev 77 check invoice

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index dc5abec7..201031c4 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -65,7 +65,7 @@
 									type="object"
 									class="oe_stat_button"
 									icon="fa-truck"
-									attrs="{'invisible': [('picking_ids', '=', False)]}">
+									attrs="{'invisible': [('picking_ids', '=', False), ('state', 'in', ['draft', 'approval_sales', 'approval_logistic', 'approval_finance'])]}">
 								<field name="picking_ids" widget="statinfo" string="Delivery"/>
 							</button>
 						</div>
-- 
cgit v1.2.3


From aa217ff1809015908d7aa16683de9b9ca34e1910 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 8 Jul 2025 10:54:37 +0700
Subject: <miqdad> rev 77 po fix sequence

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index b02e927a..8ae532cc 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -201,7 +201,7 @@
         <record id="seq_tukar_guling_po" model="ir.sequence">
             <field name="name">Pengajuan Return PO</field>
             <field name="code">tukar.guling.po</field>
-            <field name="prefix">VCM</field>
+            <field name="prefix">VCM/</field>
             <field name="padding">5</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
-- 
cgit v1.2.3


From 3df2346732b38eb47accfb07d3dfb0feaab65854 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 9 Jul 2025 08:58:47 +0700
Subject: cr approval payment terms

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index 44bd99f8..008582f5 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -13,7 +13,13 @@
                 <field name="approve_sales_manager" optional="hide"/>
                 <field name="approve_finance" optional="hide"/>
                 <field name="approve_leader" optional="hide"/>
+                <field name="create_date" optional="hide"/>
                 <field name="create_uid" optional="hide"/>
+                <field name="sale_order_id" optional="hide"/>
+                <field name="total" optional="hide"/>
+                <field name="state" widget="badge" decoration-danger="state == 'rejected'" 
+                decoration-success="state == 'approved'"
+                decoration-info="state == 'waiting_approval'"/>
             </tree>
         </field>
     </record>
@@ -56,6 +62,8 @@
                             <field name="approve_sales_manager" readonly="1"/>
                             <field name="approve_finance" readonly="1"/>
                             <field name="approve_leader" readonly="1"/>
+                            <field name="sale_order_id"/>
+                            <field name="total"/>
                         </group>
                     </group>
                 </sheet>
-- 
cgit v1.2.3


From 21128e0f165045558c2c8ef6faf199d4379614b1 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 9 Jul 2025 09:54:13 +0700
Subject: <miqdad> rev 77 vals

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 201031c4..41e9a18d 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -50,7 +50,7 @@
 								attrs="{'invisible': [('state', 'not in', ['approval_sales', 'approval_logistic', 'approval_finance'])]}"/>
 						<button name="action_cancel" string="Cancel" type="object"
 								class="btn-secondary"
-								attrs="{'invisible': [('state', 'in', ['draft', 'cancel'])]}"
+								attrs="{'invisible': [('state', '=', 'cancel')]}"
 								confirm="Are you sure you want to cancel this record?"/>
 						<button name="action_draft" string="Set to Draft" type="object"
 								class="btn-secondary"
-- 
cgit v1.2.3


From aedf25e194d4ddddab9b158b473164151109edaf Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 9 Jul 2025 10:16:19 +0700
Subject: <miqdad> rev 77 vals bu input

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling_po.xml b/indoteknik_custom/views/tukar_guling_po.xml
index 6e13eee2..0e29e965 100644
--- a/indoteknik_custom/views/tukar_guling_po.xml
+++ b/indoteknik_custom/views/tukar_guling_po.xml
@@ -50,7 +50,7 @@
 								attrs="{'invisible': [('state', 'not in', ['approval_purchase', 'approval_logistic', 'approval_finance'])]}"/>
 						<button name="action_cancel" string="Cancel" type="object"
 								class="btn-secondary"
-								attrs="{'invisible': [('state', '=', 'draft')]}"
+								attrs="{'invisible': [('state', '=', 'cancel')]}"
 								confirm="Are you sure you want to cancel this record?"/>
 						<button name="action_draft" string="Set to Draft" type="object"
 								class="btn-secondary"
-- 
cgit v1.2.3


From 7cf4a10aa25c1f358b57d01ebf4efdbbcdd7b6a9 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 9 Jul 2025 10:57:41 +0700
Subject: change request approval payment terms

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index 008582f5..9b4cdb60 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -50,10 +50,10 @@
                             <field name="number" readonly="1"/>
                             <field name="partner_id"/>
                             <field name="parent_id" readonly="1"/>
-                            <field name="blocking_stage" attrs="{'readonly': [('number', '=', False)]}"/>
-                            <field name="warning_stage" attrs="{'readonly': [('number', '=', False)]}"/>
-                            <field name="property_payment_term_id" attrs="{'readonly': [('number', '=', False)]}"/>
-                            <field name="active_limit" attrs="{'readonly': [('number', '=', False)]}"/>
+                            <field name="blocking_stage" attrs="{'readonly': [('number', '=', False), ('state', in, ['approved','rejected'])]}"/>
+                            <field name="warning_stage" attrs="{'readonly': [('number', '=', False), ('state', in, ['approved','rejected'])]}"/>
+                            <field name="property_payment_term_id" attrs="{'readonly': [('number', '=', False), ('state', in, ['approved','rejected'])]}"/>
+                            <field name="active_limit" attrs="{'readonly': [('number', '=', False), ('state', in, ['approved','rejected'])]}"/>
                         </group>
                         <group>
                             <field name="reason"/>
-- 
cgit v1.2.3


From fb838e1d3ede81cbe12d82579165eb0f2bf6e932 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 9 Jul 2025 10:59:59 +0700
Subject: fix bug

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index 9b4cdb60..0a3b4409 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -15,7 +15,7 @@
                 <field name="approve_leader" optional="hide"/>
                 <field name="create_date" optional="hide"/>
                 <field name="create_uid" optional="hide"/>
-                <field name="sale_order_id" optional="hide"/>
+                <field name="sale_order_ids" optional="hide"/>
                 <field name="total" optional="hide"/>
                 <field name="state" widget="badge" decoration-danger="state == 'rejected'" 
                 decoration-success="state == 'approved'"
@@ -62,7 +62,7 @@
                             <field name="approve_sales_manager" readonly="1"/>
                             <field name="approve_finance" readonly="1"/>
                             <field name="approve_leader" readonly="1"/>
-                            <field name="sale_order_id"/>
+                            <field name="sale_order_ids"/>
                             <field name="total"/>
                         </group>
                     </group>
-- 
cgit v1.2.3


From 9e5466f19dbbcad7216a3845dbd9515dde2291fb Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 9 Jul 2025 11:02:01 +0700
Subject: fix bug

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index 0a3b4409..5027c416 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -50,10 +50,10 @@
                             <field name="number" readonly="1"/>
                             <field name="partner_id"/>
                             <field name="parent_id" readonly="1"/>
-                            <field name="blocking_stage" attrs="{'readonly': [('number', '=', False), ('state', in, ['approved','rejected'])]}"/>
-                            <field name="warning_stage" attrs="{'readonly': [('number', '=', False), ('state', in, ['approved','rejected'])]}"/>
-                            <field name="property_payment_term_id" attrs="{'readonly': [('number', '=', False), ('state', in, ['approved','rejected'])]}"/>
-                            <field name="active_limit" attrs="{'readonly': [('number', '=', False), ('state', in, ['approved','rejected'])]}"/>
+                            <field name="blocking_stage" attrs="{'readonly': [('number', '=', False), ('state', 'in', ['approved','rejected'])]}"/>
+                            <field name="warning_stage" attrs="{'readonly': [('number', '=', False), ('state', 'in', ['approved','rejected'])]}"/>
+                            <field name="property_payment_term_id" attrs="{'readonly': [('number', '=', False), ('state', 'in', ['approved','rejected'])]}"/>
+                            <field name="active_limit" attrs="{'readonly': [('number', '=', False), ('state', 'in', ['approved','rejected'])]}"/>
                         </group>
                         <group>
                             <field name="reason"/>
-- 
cgit v1.2.3


From 3537b1a2c0cea81db9c8d09656fa638745579752 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 9 Jul 2025 11:07:11 +0700
Subject: push

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index 5027c416..ca3ce02d 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -15,7 +15,7 @@
                 <field name="approve_leader" optional="hide"/>
                 <field name="create_date" optional="hide"/>
                 <field name="create_uid" optional="hide"/>
-                <field name="sale_order_ids" optional="hide"/>
+                <field name="sale_order_ids" optional="hide" widget="many2many_tags"/>
                 <field name="total" optional="hide"/>
                 <field name="state" widget="badge" decoration-danger="state == 'rejected'" 
                 decoration-success="state == 'approved'"
@@ -62,7 +62,7 @@
                             <field name="approve_sales_manager" readonly="1"/>
                             <field name="approve_finance" readonly="1"/>
                             <field name="approve_leader" readonly="1"/>
-                            <field name="sale_order_ids"/>
+                            <field name="sale_order_ids" widget="many2many_tags"/>
                             <field name="total"/>
                         </group>
                     </group>
-- 
cgit v1.2.3


From 0604dbc3a2789c139ea66dd561726f796ad92cd6 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Wed, 9 Jul 2025 11:15:10 +0700
Subject: add grand total on approval payment term

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index ca3ce02d..e785b72a 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -17,6 +17,7 @@
                 <field name="create_uid" optional="hide"/>
                 <field name="sale_order_ids" optional="hide" widget="many2many_tags"/>
                 <field name="total" optional="hide"/>
+                <field name="grand_total" optional="hide"/>
                 <field name="state" widget="badge" decoration-danger="state == 'rejected'" 
                 decoration-success="state == 'approved'"
                 decoration-info="state == 'waiting_approval'"/>
@@ -64,6 +65,7 @@
                             <field name="approve_leader" readonly="1"/>
                             <field name="sale_order_ids" widget="many2many_tags"/>
                             <field name="total"/>
+                            <field name="grand_total"/>
                         </group>
                     </group>
                 </sheet>
-- 
cgit v1.2.3


From db98db3e34ac47eeea0fc53f215cb483d6c5d5f9 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 9 Jul 2025 11:32:19 +0700
Subject: (andri) scheduler reminder due inv

---
 .../views/mail_template_invoice_reminder.xml       | 55 ++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 indoteknik_custom/views/mail_template_invoice_reminder.xml

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/mail_template_invoice_reminder.xml b/indoteknik_custom/views/mail_template_invoice_reminder.xml
new file mode 100644
index 00000000..b19171b2
--- /dev/null
+++ b/indoteknik_custom/views/mail_template_invoice_reminder.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <data noupdate="1">
+    <record id="mail_template_invoice_due_reminder" model="mail.template">
+      <field name="name">Invoice Reminder: Due Date Notification</field>
+      <field name="model_id" ref="account.model_account_move"/>
+      <field name="subject">[Reminder] Invoice ${object.name} is Due Soon</field>
+      <field name="email_from">finance@indoteknik.co.id</field>
+      <field name="reply_to">finance@indoteknik.co.id</field>
+      <field name="email_to">andrifebriyadiputra@gmail.com</field>
+      <field name="body_html" type="html">
+        <div style="font-family:Arial, sans-serif; font-size:14px;">
+          <p>Dengan Hormat Bpk/Ibu ${object.partner_id.name},</p>
+
+          <p>Berikut adalah detail invoice Anda yang sudah mendekati atau telah jatuh tempo:</p>
+
+          <table border="1" cellpadding="6" cellspacing="0" style="border-collapse: collapse; width: 100%;">
+            <thead>
+              <tr style="background-color: #f2f2f2;">
+                <th>Invoice Number</th>
+                <th>Tanggal Invoice</th>
+                <th>Jatuh Tempo</th>
+                <th>Sisa Hari</th>
+                <th>Total</th>
+                <th>Referensi</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>${object.name}</td>
+                <td>${format_date(object.invoice_date)}</td>
+                <td>${format_date(object.invoice_date_due)}</td>
+                <td>${object.invoice_day_to_due}</td>
+                <td>${format_amount(object.amount_total, object.currency_id)}</td>
+                <td>${object.ref or '-'}</td>
+              </tr>
+            </tbody>
+          </table>
+
+          <p>Mohon segera melakukan proses pembayaran sebelum jatuh tempo.</p>
+
+          <p>Terima kasih atas perhatian dan kerjasamanya.</p>
+
+          <p>
+            Hormat Kami,<br/>
+            <strong>PT. INDOTEKNIK DOTCOM GEMILANG</strong><br/>
+            Jl. Bandengan Utara 85A No. 8-9, Penjaringan, Jakarta Utara<br/>
+            Telp: 021-2933 8828 / 29 | Email: finance@indoteknik.co.id
+          </p>
+        </div>
+      </field>
+      <field name="auto_delete" eval="True"/>
+    </record>
+  </data>
+</odoo>
-- 
cgit v1.2.3


From c72db0d0fa214e6691fa9a293020e7091a9c82c2 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Wed, 9 Jul 2025 13:42:33 +0700
Subject: (andri) fix invoices

---
 .../views/mail_template_invoice_reminder.xml       | 43 ++++++++++++----------
 1 file changed, 24 insertions(+), 19 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/mail_template_invoice_reminder.xml b/indoteknik_custom/views/mail_template_invoice_reminder.xml
index b19171b2..176a68ba 100644
--- a/indoteknik_custom/views/mail_template_invoice_reminder.xml
+++ b/indoteknik_custom/views/mail_template_invoice_reminder.xml
@@ -3,22 +3,23 @@
   <data noupdate="1">
     <record id="mail_template_invoice_due_reminder" model="mail.template">
       <field name="name">Invoice Reminder: Due Date Notification</field>
-      <field name="model_id" ref="account.model_account_move"/>
-      <field name="subject">[Reminder] Invoice ${object.name} is Due Soon</field>
+      <field name="model_id" ref="base.model_res_partner"/>
+      <field name="subject">[Reminder] Invoice Due Summary for ${object.name}</field>
       <field name="email_from">finance@indoteknik.co.id</field>
-      <field name="reply_to">finance@indoteknik.co.id</field>
       <field name="email_to">andrifebriyadiputra@gmail.com</field>
+      <!-- <field name="email_to">${object.email|safe}</field> -->
       <field name="body_html" type="html">
         <div style="font-family:Arial, sans-serif; font-size:14px;">
-          <p>Dengan Hormat Bpk/Ibu ${object.partner_id.name},</p>
+          <p>Dengan Hormat Bpk/Ibu ${object.name},</p>
 
-          <p>Berikut adalah detail invoice Anda yang sudah mendekati atau telah jatuh tempo:</p>
+          <p>Berikut adalah daftar invoice Anda yang mendekati atau telah jatuh tempo:</p>
 
           <table border="1" cellpadding="6" cellspacing="0" style="border-collapse: collapse; width: 100%;">
             <thead>
               <tr style="background-color: #f2f2f2;">
+                <th>No</th>
                 <th>Invoice Number</th>
-                <th>Tanggal Invoice</th>
+                <th>Tanggal</th>
                 <th>Jatuh Tempo</th>
                 <th>Sisa Hari</th>
                 <th>Total</th>
@@ -26,30 +27,34 @@
               </tr>
             </thead>
             <tbody>
-              <tr>
-                <td>${object.name}</td>
-                <td>${format_date(object.invoice_date)}</td>
-                <td>${format_date(object.invoice_date_due)}</td>
-                <td>${object.invoice_day_to_due}</td>
-                <td>${format_amount(object.amount_total, object.currency_id)}</td>
-                <td>${object.ref or '-'}</td>
-              </tr>
+              <t t-set="i" t-value="1"/>
+              <t t-foreach="ctx.get('invoices', [])" t-as="inv">
+                <tr>
+                  <td><t t-esc="i"/></td>
+                  <td><t t-esc="inv.name"/></td>
+                  <td><t t-esc="format_date(inv.invoice_date)"/></td>
+                  <td><t t-esc="format_date(inv.invoice_date_due)"/></td>
+                  <td><t t-esc="inv.invoice_day_to_due"/></td>
+                  <td><t t-esc="format_amount(inv.amount_total, inv.currency_id)"/></td>
+                  <td><t t-esc="inv.ref or '-'"/></td>
+                </tr>
+                <t t-set="i" t-value="i + 1"/>
+              </t>
             </tbody>
           </table>
 
-          <p>Mohon segera melakukan proses pembayaran sebelum jatuh tempo.</p>
-
-          <p>Terima kasih atas perhatian dan kerjasamanya.</p>
+          <p>Mohon segera melakukan proses pembayaran. Terima kasih.</p>
 
           <p>
             Hormat Kami,<br/>
             <strong>PT. INDOTEKNIK DOTCOM GEMILANG</strong><br/>
-            Jl. Bandengan Utara 85A No. 8-9, Penjaringan, Jakarta Utara<br/>
-            Telp: 021-2933 8828 / 29 | Email: finance@indoteknik.co.id
+            Telp: 021-2933 8828 / 29<br/>
+            Email: finance@indoteknik.co.id
           </p>
         </div>
       </field>
       <field name="auto_delete" eval="True"/>
     </record>
+
   </data>
 </odoo>
-- 
cgit v1.2.3


From 8e80bb240aa74c8b2942d983e73ff501f5b8defc Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 10 Jul 2025 15:12:36 +0700
Subject: (andri) rev mutiple invoices reminder

---
 .../views/mail_template_invoice_reminder.xml       | 25 ++++++----------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/mail_template_invoice_reminder.xml b/indoteknik_custom/views/mail_template_invoice_reminder.xml
index b19171b2..b39730b6 100644
--- a/indoteknik_custom/views/mail_template_invoice_reminder.xml
+++ b/indoteknik_custom/views/mail_template_invoice_reminder.xml
@@ -2,17 +2,16 @@
 <odoo>
   <data noupdate="1">
     <record id="mail_template_invoice_due_reminder" model="mail.template">
-      <field name="name">Invoice Reminder: Due Date Notification</field>
-      <field name="model_id" ref="account.model_account_move"/>
-      <field name="subject">[Reminder] Invoice ${object.name} is Due Soon</field>
+      <field name="name">Invoice Reminder: Due Date Notification (Manual)</field>
+      <field name="model_id" ref="base.model_res_partner"/>
+      <field name="subject">[Reminder] Invoice Manual</field>
       <field name="email_from">finance@indoteknik.co.id</field>
-      <field name="reply_to">finance@indoteknik.co.id</field>
-      <field name="email_to">andrifebriyadiputra@gmail.com</field>
+      <field name="email_to">test@example.com</field>
       <field name="body_html" type="html">
         <div style="font-family:Arial, sans-serif; font-size:14px;">
-          <p>Dengan Hormat Bpk/Ibu ${object.partner_id.name},</p>
+          <p>Dengan Hormat Bpk/Ibu,</p>
 
-          <p>Berikut adalah detail invoice Anda yang sudah mendekati atau telah jatuh tempo:</p>
+          <p>Berikut adalah daftar invoice Anda yang mendekati atau telah jatuh tempo:</p>
 
           <table border="1" cellpadding="6" cellspacing="0" style="border-collapse: collapse; width: 100%;">
             <thead>
@@ -26,20 +25,10 @@
               </tr>
             </thead>
             <tbody>
-              <tr>
-                <td>${object.name}</td>
-                <td>${format_date(object.invoice_date)}</td>
-                <td>${format_date(object.invoice_date_due)}</td>
-                <td>${object.invoice_day_to_due}</td>
-                <td>${format_amount(object.amount_total, object.currency_id)}</td>
-                <td>${object.ref or '-'}</td>
-              </tr>
             </tbody>
           </table>
 
-          <p>Mohon segera melakukan proses pembayaran sebelum jatuh tempo.</p>
-
-          <p>Terima kasih atas perhatian dan kerjasamanya.</p>
+          <p>Mohon segera melakukan proses pembayaran untuk invoice-invoice tersebut.</p>
 
           <p>
             Hormat Kami,<br/>
-- 
cgit v1.2.3


From 839474c5f411b8c6c2476d8dcda9a6068d9848e5 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 10 Jul 2025 15:28:10 +0700
Subject: (andri) try test

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/mail_template_invoice_reminder.xml b/indoteknik_custom/views/mail_template_invoice_reminder.xml
index b39730b6..92362284 100644
--- a/indoteknik_custom/views/mail_template_invoice_reminder.xml
+++ b/indoteknik_custom/views/mail_template_invoice_reminder.xml
@@ -6,7 +6,7 @@
       <field name="model_id" ref="base.model_res_partner"/>
       <field name="subject">[Reminder] Invoice Manual</field>
       <field name="email_from">finance@indoteknik.co.id</field>
-      <field name="email_to">test@example.com</field>
+      <field name="email_to">andrifebriyadiputra@gmail.com</field>
       <field name="body_html" type="html">
         <div style="font-family:Arial, sans-serif; font-size:14px;">
           <p>Dengan Hormat Bpk/Ibu,</p>
-- 
cgit v1.2.3


From 9aa1682f36cad78e04d3367c1d30867c7706a5d1 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Thu, 10 Jul 2025 17:15:02 +0700
Subject: (andri) fix invoices date due

---
 indoteknik_custom/views/mail_template_invoice_reminder.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/mail_template_invoice_reminder.xml b/indoteknik_custom/views/mail_template_invoice_reminder.xml
index 92362284..4ed91c75 100644
--- a/indoteknik_custom/views/mail_template_invoice_reminder.xml
+++ b/indoteknik_custom/views/mail_template_invoice_reminder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-  <data noupdate="1">
+  <data noupdate="0">
     <record id="mail_template_invoice_due_reminder" model="mail.template">
       <field name="name">Invoice Reminder: Due Date Notification (Manual)</field>
-      <field name="model_id" ref="base.model_res_partner"/>
+      <field name="model_id" ref="account.model_account_move"/>
       <field name="subject">[Reminder] Invoice Manual</field>
       <field name="email_from">finance@indoteknik.co.id</field>
       <field name="email_to">andrifebriyadiputra@gmail.com</field>
       <field name="body_html" type="html">
         <div style="font-family:Arial, sans-serif; font-size:14px;">
-          <p>Dengan Hormat Bpk/Ibu,</p>
+          <p><b>Dear ${object.name},</b></p>
 
           <p>Berikut adalah daftar invoice Anda yang mendekati atau telah jatuh tempo:</p>
 
@@ -28,7 +28,8 @@
             </tbody>
           </table>
 
-          <p>Mohon segera melakukan proses pembayaran untuk invoice-invoice tersebut.</p>
+          <p>Mohon bantuan dan kerjasamanya agar tetap bisa bekerjasama dengan baik</p>
+          <p>Terima Kasih</p>
 
           <p>
             Hormat Kami,<br/>
-- 
cgit v1.2.3


From 575a7a506382487a625914a7bde9a18b20173cc6 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Fri, 11 Jul 2025 10:45:26 +0700
Subject: (andri) rev template email & fix sequence approval

---
 indoteknik_custom/views/ir_sequence.xml            |  2 +-
 .../views/mail_template_invoice_reminder.xml       | 26 +++++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index a0f5fc6b..d9b93ff3 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -154,7 +154,7 @@
         <record id="sequence_approval_payment_term" model="ir.sequence">
             <field name="name">Approval Payment Term</field>
             <field name="code">approval.payment.term</field>
-            <field name="prefix">APP/%(year)s/</field>
+            <field name="prefix">APT/%(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/mail_template_invoice_reminder.xml b/indoteknik_custom/views/mail_template_invoice_reminder.xml
index 4ed91c75..8b3b9880 100644
--- a/indoteknik_custom/views/mail_template_invoice_reminder.xml
+++ b/indoteknik_custom/views/mail_template_invoice_reminder.xml
@@ -2,20 +2,20 @@
 <odoo>
   <data noupdate="0">
     <record id="mail_template_invoice_due_reminder" model="mail.template">
-      <field name="name">Invoice Reminder: Due Date Notification (Manual)</field>
+      <field name="name">Invoice Reminder: Due Date Notification</field>
       <field name="model_id" ref="account.model_account_move"/>
-      <field name="subject">[Reminder] Invoice Manual</field>
+      <field name="subject">Reminder Invoice Due - ${object.name}</field>
       <field name="email_from">finance@indoteknik.co.id</field>
       <field name="email_to">andrifebriyadiputra@gmail.com</field>
       <field name="body_html" type="html">
-        <div style="font-family:Arial, sans-serif; font-size:14px;">
+        <div>
           <p><b>Dear ${object.name},</b></p>
 
           <p>Berikut adalah daftar invoice Anda yang mendekati atau telah jatuh tempo:</p>
 
           <table border="1" cellpadding="6" cellspacing="0" style="border-collapse: collapse; width: 100%;">
             <thead>
-              <tr style="background-color: #f2f2f2;">
+              <tr style="background-color: #f2f2f2;" align="left">
                 <th>Invoice Number</th>
                 <th>Tanggal Invoice</th>
                 <th>Jatuh Tempo</th>
@@ -29,14 +29,18 @@
           </table>
 
           <p>Mohon bantuan dan kerjasamanya agar tetap bisa bekerjasama dengan baik</p>
-          <p>Terima Kasih</p>
+          <p>Terima Kasih.</p>
+                <br/>
+                <br/>
+                <p><b>Best Regards,
+                    <br/>
+                    <br/>
+                    Widya R.<br/>
+                    Dept. Finance<br/>
+                    PT. INDOTEKNIK DOTCOM GEMILANG</b><br/>
+                    <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" alt="Indoteknik" style="max-width: 18%; height: auto;"></img><br/>
+                    +62-857-1697-0374 | finance@indoteknik.co.id</p>
 
-          <p>
-            Hormat Kami,<br/>
-            <strong>PT. INDOTEKNIK DOTCOM GEMILANG</strong><br/>
-            Jl. Bandengan Utara 85A No. 8-9, Penjaringan, Jakarta Utara<br/>
-            Telp: 021-2933 8828 / 29 | Email: finance@indoteknik.co.id
-          </p>
         </div>
       </field>
       <field name="auto_delete" eval="True"/>
-- 
cgit v1.2.3


From 3021a1d4836a47721500d03eeed80ba029334b98 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 11 Jul 2025 15:24:46 +0700
Subject: fix bug

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index e785b72a..8d1d01e8 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -51,10 +51,10 @@
                             <field name="number" readonly="1"/>
                             <field name="partner_id"/>
                             <field name="parent_id" readonly="1"/>
-                            <field name="blocking_stage" attrs="{'readonly': [('number', '=', False), ('state', 'in', ['approved','rejected'])]}"/>
-                            <field name="warning_stage" attrs="{'readonly': [('number', '=', False), ('state', 'in', ['approved','rejected'])]}"/>
-                            <field name="property_payment_term_id" attrs="{'readonly': [('number', '=', False), ('state', 'in', ['approved','rejected'])]}"/>
-                            <field name="active_limit" attrs="{'readonly': [('number', '=', False), ('state', 'in', ['approved','rejected'])]}"/>
+                            <field name="blocking_stage" attrs="{'readonly': ['|', ('number', '=', False), ('state', 'in', ['approved','rejected'])]}"/>
+                            <field name="warning_stage" attrs="{'readonly': ['|', ('number', '=', False), ('state', 'in', ['approved','rejected'])]}"/>
+                            <field name="property_payment_term_id" attrs="{'readonly': ['|', ('number', '=', False), ('state', 'in', ['approved','rejected'])]}"/>
+                            <field name="active_limit" attrs="{'readonly': ['|', ('number', '=', False), ('state', 'in', ['approved','rejected'])]}"/>
                         </group>
                         <group>
                             <field name="reason"/>
-- 
cgit v1.2.3


From b298a37963027a08e0046629bbcb795effa58e3a Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Fri, 11 Jul 2025 15:40:38 +0700
Subject: view and add new status on approval payment term

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index 8d1d01e8..373637a2 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -9,18 +9,18 @@
                 <field name="partner_id"/>
                 <field name="parent_id"/>
                 <field name="property_payment_term_id"/>
+                <field name="create_date" optional="hide"/>
                 <field name="approve_date" optional="hide"/>
                 <field name="approve_sales_manager" optional="hide"/>
                 <field name="approve_finance" optional="hide"/>
                 <field name="approve_leader" optional="hide"/>
-                <field name="create_date" optional="hide"/>
                 <field name="create_uid" optional="hide"/>
                 <field name="sale_order_ids" optional="hide" widget="many2many_tags"/>
                 <field name="total" optional="hide"/>
                 <field name="grand_total" optional="hide"/>
                 <field name="state" widget="badge" decoration-danger="state == 'rejected'" 
                 decoration-success="state == 'approved'"
-                decoration-info="state == 'waiting_approval'"/>
+                decoration-info="state in ['waiting_approval_sales_manager', 'waiting_approval_finance', 'waiting_approval_leader']"/>
             </tree>
         </field>
     </record>
-- 
cgit v1.2.3


From f6d21f2f6a8bbc597e70aa07a4f6c2fc43b4c176 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Sat, 12 Jul 2025 10:20:18 +0700
Subject: add change log widya only

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index 373637a2..cc9db914 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -21,6 +21,7 @@
                 <field name="state" widget="badge" decoration-danger="state == 'rejected'" 
                 decoration-success="state == 'approved'"
                 decoration-info="state in ['waiting_approval_sales_manager', 'waiting_approval_finance', 'waiting_approval_leader']"/>
+                <field name="change_log_688" optional="hide"/>
             </tree>
         </field>
     </record>
-- 
cgit v1.2.3


From 6f4d19cd6985790414b06678fe2147c431caed9e Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Sat, 12 Jul 2025 11:28:38 +0700
Subject: (andri)chatter send email reminder due invoices terkait

---
 indoteknik_custom/views/mail_template_invoice_reminder.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/mail_template_invoice_reminder.xml b/indoteknik_custom/views/mail_template_invoice_reminder.xml
index 8b3b9880..21055eb0 100644
--- a/indoteknik_custom/views/mail_template_invoice_reminder.xml
+++ b/indoteknik_custom/views/mail_template_invoice_reminder.xml
@@ -13,7 +13,7 @@
 
           <p>Berikut adalah daftar invoice Anda yang mendekati atau telah jatuh tempo:</p>
 
-          <table border="1" cellpadding="6" cellspacing="0" style="border-collapse: collapse; width: 100%;">
+          <table border="1" cellpadding="4" cellspacing="0" style="border-collapse: collapse; width: 100%; font-size: 12px">
             <thead>
               <tr style="background-color: #f2f2f2;" align="left">
                 <th>Invoice Number</th>
@@ -37,9 +37,11 @@
                     <br/>
                     Widya R.<br/>
                     Dept. Finance<br/>
-                    PT. INDOTEKNIK DOTCOM GEMILANG</b><br/>
+                    PT. INDOTEKNIK DOTCOM GEMILANG<br/>
                     <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" alt="Indoteknik" style="max-width: 18%; height: auto;"></img><br/>
-                    +62-857-1697-0374 | finance@indoteknik.co.id</p>
+                    <a href="https://wa.me/6285716970374" target="_blank">+62-857-1697-0374</a> | 
+                    <a href="mailto:finance@indoteknik.co.id">finance@indoteknik.co.id</a>
+                    </b></p>
 
         </div>
       </field>
-- 
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')

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')

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


From 1b70be54f939974c0232abf215f8a432b6c15244 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Mon, 14 Jul 2025 15:44:26 +0700
Subject: (andri) fix seq cust benefit

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index d9b93ff3..f2b42c3b 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -164,7 +164,7 @@
         <record id="sequence_commision_fee" model="ir.sequence">
             <field name="name">Customer Commision Fee</field>
             <field name="code">customer.commision.fee</field>
-            <field name="prefix">FE/%(year)s/</field>
+            <field name="prefix">CC/%(year)s/</field>
             <field name="padding">5</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
-- 
cgit v1.2.3


From 4dd6ef58e2c60df7cb25b65ae6ad23d3bee2ebc1 Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 15 Jul 2025 11:13:04 +0700
Subject: add so number on purchasing job

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchasing_job.xml b/indoteknik_custom/views/purchasing_job.xml
index bb1c7643..976f1485 100644
--- a/indoteknik_custom/views/purchasing_job.xml
+++ b/indoteknik_custom/views/purchasing_job.xml
@@ -18,6 +18,7 @@
                 <field name="action"/>
                 <field name="note"/>
                 <field name="date_po"/>
+                <field name="so_number"/>
             </tree>
         </field>
     </record>
@@ -41,6 +42,7 @@
                             <field name="item_code"/>
                             <field name="product"/>
                             <field name="action"/>
+                            <field name="so_number"/>
                         </group>
                         <group>
                             <field name="onhand"/>
-- 
cgit v1.2.3


From 0198b0a0683cc7db1241ec9b7184c2cb608ba049 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 15 Jul 2025 11:52:33 +0700
Subject: (andri) fix edit unit price PO

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index dae23eed..fa8d40d5 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -164,7 +164,7 @@
                 </field>
 
                 <field name="order_line" position="attributes">
-                    <attribute name="attrs">{'readonly': ['|', ('state', 'in', ['purchase', 'done', 'cancel']), ('has_active_invoice', '=', True)]}</attribute>
+                    <attribute name="attrs">{'readonly': ['&amp;', ('state', 'in', ['purchase', 'done', 'cancel']), ('has_active_invoice', '=', True)]}</attribute>
                 </field>
                 
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="attributes">
-- 
cgit v1.2.3


From f3fc6d3d1a4c5ac0b287e3bb7e1163b99393c728 Mon Sep 17 00:00:00 2001
From: "Indoteknik ." <it@fixcomart.co.id>
Date: Tue, 15 Jul 2025 13:20:58 +0700
Subject: (andri) fix

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index fa8d40d5..dae23eed 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -164,7 +164,7 @@
                 </field>
 
                 <field name="order_line" position="attributes">
-                    <attribute name="attrs">{'readonly': ['&amp;', ('state', 'in', ['purchase', 'done', 'cancel']), ('has_active_invoice', '=', True)]}</attribute>
+                    <attribute name="attrs">{'readonly': ['|', ('state', 'in', ['purchase', 'done', 'cancel']), ('has_active_invoice', '=', True)]}</attribute>
                 </field>
                 
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="attributes">
-- 
cgit v1.2.3


From 77d3bd2541a52270f03b84e38dd691630bcd82af Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 16 Jul 2025 08:47:04 +0700
Subject: <miqdad> mapping koli tukar guling

---
 indoteknik_custom/views/tukar_guling.xml | 155 ++++++++++++++++---------------
 1 file changed, 78 insertions(+), 77 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 41e9a18d..903a47fd 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -36,81 +36,82 @@
 			</field>
 		</record>
 		<!-- Form View -->
-		<record id="pengajuan_tukar_guling_form" model="ir.ui.view">
-			<field name="name">pengajuan.tukar.guling.form</field>
-			<field name="model">tukar.guling</field>
-			<field name="arch" type="xml">
-				<form>
-					<header>
-						<button name="action_submit" string="Submit" type="object"
-								class="btn-primary"
-								attrs="{'invisible': [('state', '!=', 'draft')]}"/>
-						<button name="action_approve" string="Approve" type="object"
-								class="btn-primary"
-								attrs="{'invisible': [('state', 'not in', ['approval_sales', 'approval_logistic', 'approval_finance'])]}"/>
-						<button name="action_cancel" string="Cancel" type="object"
-								class="btn-secondary"
-								attrs="{'invisible': [('state', '=', 'cancel')]}"
-								confirm="Are you sure you want to cancel this record?"/>
-						<button name="action_draft" string="Set to Draft" type="object"
-								class="btn-secondary"
-								attrs="{'invisible': [('state', '!=', 'cancel')]}"
-								confirm="Are you sure you want to reset this record to draft?"/>
-						<field name="state" widget="statusbar" readonly="1"
-							   statusbar_visible="draft,approval_sales,approval_logistic,approval_finance,done"/>
-					</header>
-					<sheet>
-						<div class="oe_button_box">
-							<button name="action_view_picking"
-									type="object"
-									class="oe_stat_button"
-									icon="fa-truck"
-									attrs="{'invisible': [('picking_ids', '=', False), ('state', 'in', ['draft', 'approval_sales', 'approval_logistic', 'approval_finance'])]}">
-								<field name="picking_ids" widget="statinfo" string="Delivery"/>
-							</button>
-						</div>
-						<div class="oe_title">
-							<h1>
-								<field name="name" readonly="1" class="oe_inline"/>
-							</h1>
-						</div>
-						<group>
-							<group>
-								<field name="date" string="Date" readonly="1"/>
-								<field name="return_type"/>
-								<!--								<field name="ort_num" readonly="1"/>-->
-								<!--								<field name="srt_num" readonly="1"/>-->
-								<field name="operations" string="Operations"
-									   attrs="{
-           'required': [('return_type', 'in', ['revisi_so', 'tukar_guling'])]
-       }"/>
-								<field name="origin" readonly="1"/>
-								<!--								<field name="origin_so" readonly="1"/>-->
-							</group>
-							<group>
-								<field name="ba_num" string="Nomor BA"/>
-								<field name="notes"/>
-							</group>
-						</group>
-						<!-- Product Lines -->
-						<notebook>
-							<page string="Product Lines" name="product_lines" create="0" edit="0">
-								<field name="line_ids" delete="1" readonly="1">
-									<tree string="Product Lines">
-										<field name="sequence" widget="handle"/>
-										<field name="product_id" required="1"
-											   options="{'no_create': True, 'no_create_edit': True}"/>
-										<field name="name" force_save="1"/>
-										<field name="product_uom_qty" string="Quantity"/>
-										<field name="product_uom" string="UoM"
-											   options="{'no_create': True, 'no_create_edit': True}"/>
-									</tree>
-								</field>
-							</page>
-						</notebook>
-					</sheet>
-				</form>
-			</field>
-		</record>
-	</data>
+        <record id="pengajuan_tukar_guling_form" model="ir.ui.view">
+            <field name="name">pengajuan.tukar.guling.form</field>
+            <field name="model">tukar.guling</field>
+            <field name="arch" type="xml">
+                <form>
+                    <header>
+                        <button name="action_submit" string="Submit" type="object"
+                                class="btn-primary"
+                                attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+                        <button name="action_approve" string="Approve" type="object"
+                                class="btn-primary"
+                                attrs="{'invisible': [('state', 'not in', ['approval_sales', 'approval_logistic', 'approval_finance'])]}"/>
+                        <button name="action_cancel" string="Cancel" type="object"
+                                class="btn-secondary"
+                                attrs="{'invisible': [('state', '=', 'cancel')]}"/>
+                        <button name="action_draft" string="Set to Draft" type="object"
+                                class="btn-secondary"
+                                attrs="{'invisible': [('state', '!=', 'cancel')]}"/>
+                        <field name="state" widget="statusbar" readonly="1"
+                               statusbar_visible="draft,approval_sales,approval_logistic,approval_finance,done"/>
+                    </header>
+                    <sheet>
+                        <div class="oe_button_box">
+                            <button name="action_view_picking"
+                                    type="object"
+                                    class="oe_stat_button"
+                                    icon="fa-truck"
+                                    attrs="{'invisible': [('picking_ids', '=', False), ('state', 'in', ['draft', 'approval_sales', 'approval_logistic', 'approval_finance'])]}">
+                                <field name="picking_ids" widget="statinfo" string="Delivery"/>
+                            </button>
+                        </div>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="name" readonly="1" class="oe_inline"/>
+                            </h1>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="date" string="Date" readonly="1"/>
+                                <field name="return_type"/>
+                                <field name="operations"
+                                       attrs="{'required': [('return_type', 'in', ['revisi_so', 'tukar_guling'])]}"/>
+                                <field name="origin" readonly="1"/>
+                            </group>
+                            <group>
+                                <field name="ba_num" string="Nomor BA"/>
+                                <field name="notes"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Product Lines" name="product_lines" create="0" edit="0">
+                                <field name="line_ids" delete="1" readonly="1">
+                                    <tree string="Product Lines">
+                                        <field name="sequence" widget="handle"/>
+                                        <field name="product_id" required="1"
+                                               options="{'no_create': True, 'no_create_edit': True}"/>
+                                        <field name="name" force_save="1"/>
+                                        <field name="product_uom_qty" string="Quantity"/>
+                                        <field name="product_uom" string="UoM"
+                                               options="{'no_create': True, 'no_create_edit': True}"/>
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Mapping Koli" name="mapping_koli" create="0" edit="0">
+                                <field name="mapping_koli_ids" readonly="1">
+                                    <tree>
+                                        <field name="pick_id"/>
+                                        <field name="product_id"/>
+                                        <field name="qty_done"/>
+                                    </tree>
+                                </field>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+    </data>
 </odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 3b1bc7642b6a5d0ac19dd74563c5b353a7f3b8ba Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 16 Jul 2025 10:27:02 +0700
Subject: <miqdad> vals qty mapping koli tukar guling

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 903a47fd..c36089ad 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -99,8 +99,8 @@
                                     </tree>
                                 </field>
                             </page>
-                            <page string="Mapping Koli" name="mapping_koli" create="0" edit="0">
-                                <field name="mapping_koli_ids" readonly="1">
+                            <page string="Mapping Koli" name="mapping_koli">
+                                <field name="mapping_koli_ids">
                                     <tree>
                                         <field name="pick_id"/>
                                         <field name="product_id"/>
-- 
cgit v1.2.3


From efa1650aae2bc2dca99624092adcc21f87dab648 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 16 Jul 2025 17:40:22 +0700
Subject: <miqdad> retur blm sesuai

---
 indoteknik_custom/views/tukar_guling.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index c36089ad..acc48d3f 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -86,13 +86,13 @@
                             </group>
                         </group>
                         <notebook>
-                            <page string="Product Lines" name="product_lines" create="0" edit="0">
-                                <field name="line_ids" delete="1" readonly="1">
-                                    <tree string="Product Lines">
+                            <page string="Product Lines" name="product_lines">
+                                <field name="line_ids">
+                                    <tree string="Product Lines" editable="top" create="0" delete="1">
                                         <field name="sequence" widget="handle"/>
-                                        <field name="product_id" required="1"
-                                               options="{'no_create': True, 'no_create_edit': True}"/>
-                                        <field name="name" force_save="1"/>
+                                        <field name="product_id" required="0"
+                                               options="{'no_create': True, 'no_create_edit': True}" readonly="0"/>
+                                        <field name="name" force_save="0" readonly="1"/>
                                         <field name="product_uom_qty" string="Quantity"/>
                                         <field name="product_uom" string="UoM"
                                                options="{'no_create': True, 'no_create_edit': True}"/>
@@ -101,10 +101,11 @@
                             </page>
                             <page string="Mapping Koli" name="mapping_koli">
                                 <field name="mapping_koli_ids">
-                                    <tree>
-                                        <field name="pick_id"/>
-                                        <field name="product_id"/>
-                                        <field name="qty_done"/>
+                                    <tree editable="top" create="0" delete="1">
+                                        <field name="pick_id" readonly="1" force_save="1"/>
+                                        <field name="product_id" readonly="1" force_save="1"/>
+                                        <field name="qty_done" force_save="1"/>
+                                        <field name="qty_return"/>
                                     </tree>
                                 </field>
                             </page>
-- 
cgit v1.2.3


From 2c39fffe188f44b93b73d8f5470fb228225cb631 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Fri, 18 Jul 2025 17:25:29 +0700
Subject: <miqdad> readonly qty done mapping tuk.gul

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index acc48d3f..44b5134e 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -104,7 +104,7 @@
                                     <tree editable="top" create="0" delete="1">
                                         <field name="pick_id" readonly="1" force_save="1"/>
                                         <field name="product_id" readonly="1" force_save="1"/>
-                                        <field name="qty_done" force_save="1"/>
+                                        <field name="qty_done" force_save="1" readonly="1"/>
                                         <field name="qty_return"/>
                                     </tree>
                                 </field>
-- 
cgit v1.2.3


From 87f38f9fcb68f04a2cc8157744622c2d0ebf1eab Mon Sep 17 00:00:00 2001
From: Azka Nathan <darizkyfaz@gmail.com>
Date: Tue, 22 Jul 2025 10:54:44 +0700
Subject: notif open purchasing job

---
 indoteknik_custom/views/purchasing_job.xml | 10 +++++++++-
 1 file changed, 9 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 976f1485..e3866d84 100644
--- a/indoteknik_custom/views/purchasing_job.xml
+++ b/indoteknik_custom/views/purchasing_job.xml
@@ -4,7 +4,7 @@
         <field name="name">v.purchasing.job.tree</field>
         <field name="model">v.purchasing.job</field>
         <field name="arch" type="xml">
-            <tree create="false" multi_edit="1">
+            <tree decoration-info="(check_pj == False)" create="false" multi_edit="1">
                 <field name="product_id"/>
                 <field name="vendor_id"/>
                 <field name="purchase_representative_id"/>
@@ -19,6 +19,14 @@
                 <field name="note"/>
                 <field name="date_po"/>
                 <field name="so_number"/>
+                <field name="check_pj" invisible="1"/>
+                <button name="action_open_job_detail"
+                        string="📄"
+                        type="object"
+                        icon="fa-file"
+                        attrs="{'invisible': [('check_pj','=',True)]}"
+                        context="{}"/>
+
             </tree>
         </field>
     </record>
-- 
cgit v1.2.3


From 1de8ad79dd0f0832dd14de9c1d004884f153bec4 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 22 Jul 2025 16:42:10 +0700
Subject: <miqdad> Chatter and sequence

---
 indoteknik_custom/views/ir_sequence.xml  |  6 ++++--
 indoteknik_custom/views/tukar_guling.xml | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 3f0ba0b6..03cfbc1a 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -203,7 +203,8 @@
 		<record id="seq_tukar_guling" model="ir.sequence">
 			<field name="name">Pengajuan Return SO</field>
 			<field name="code">tukar.guling</field>
-			<field name="prefix">CCM/</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">CCM/%(year)s/</field>
 			<field name="padding">5</field>
 			<field name="number_next">1</field>
 			<field name="number_increment">1</field>
@@ -211,7 +212,8 @@
         <record id="seq_tukar_guling_po" model="ir.sequence">
             <field name="name">Pengajuan Return PO</field>
             <field name="code">tukar.guling.po</field>
-            <field name="prefix">VCM/</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">VCM/%(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/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 44b5134e..6b3492ae 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -24,14 +24,16 @@
 				<tree create="1" delete="1" default_order="create_date desc">
 					<field name="name"/>
 					<field name="date"/>
+                    <field name="origin" string="SO Number"/>
 					<field name="operations" string="Operations"/>
-					<field name="ba_num" string="Nomor BA"/>
 					<field name="return_type" string="Return Type"/>
 					<field name="state" widget="badge"
 						   decoration-info="state in ('draft', 'approval_sales', 'approval_logistic','approval_finance')"
 						   decoration-success="state == 'done'"
 						   decoration-muted="state == 'cancel'"
 					/>
+                    <field name="ba_num" string="Nomor BA"/>
+                    <field name="date_done" string="Approved Date"/>
 				</tree>
 			</field>
 		</record>
@@ -47,7 +49,7 @@
                                 attrs="{'invisible': [('state', '!=', 'draft')]}"/>
                         <button name="action_approve" string="Approve" type="object"
                                 class="btn-primary"
-                                attrs="{'invisible': [('state', 'not in', ['approval_sales', 'approval_logistic', 'approval_finance'])]}"/>
+                                attrs="{'invisible': [('state', 'not in', ['approval_sales', 'approval_finance', 'approval_logistic'])]}"/>
                         <button name="action_cancel" string="Cancel" type="object"
                                 class="btn-secondary"
                                 attrs="{'invisible': [('state', '=', 'cancel')]}"/>
@@ -75,14 +77,17 @@
                         <group>
                             <group>
                                 <field name="date" string="Date" readonly="1"/>
-                                <field name="return_type"/>
+                                <field name="return_type" attrs="{'readonly': [('state', 'not in', 'draft')]}"/>
                                 <field name="operations"
-                                       attrs="{'required': [('return_type', 'in', ['revisi_so', 'tukar_guling'])]}"/>
+                                       attrs="{'readonly': [('state', 'not in', 'draft')]}"/>
                                 <field name="origin" readonly="1"/>
                             </group>
                             <group>
                                 <field name="ba_num" string="Nomor BA"/>
                                 <field name="notes"/>
+                                <field name="date_sales" readonly="1"/>
+                                <field name="date_logistic" readonly="1"/>
+                                <field name="date_done" readonly="1"/>
                             </group>
                         </group>
                         <notebook>
@@ -111,6 +116,10 @@
                             </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>
-- 
cgit v1.2.3


From 158c89a5048669f46d561aef3505042cc8c68a37 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Tue, 22 Jul 2025 19:51:47 +0700
Subject: <miqdad> change approval flow

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 6b3492ae..95f36090 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -28,12 +28,12 @@
 					<field name="operations" string="Operations"/>
 					<field name="return_type" string="Return Type"/>
 					<field name="state" widget="badge"
-						   decoration-info="state in ('draft', 'approval_sales', 'approval_logistic','approval_finance')"
+						   decoration-info="state in ('draft', 'approval_sales', 'approval_finance','approval_logistic')"
 						   decoration-success="state == 'done'"
 						   decoration-muted="state == 'cancel'"
 					/>
                     <field name="ba_num" string="Nomor BA"/>
-                    <field name="date_done" string="Approved Date"/>
+                    <field name="date_logistic" string="Approved Date"/>
 				</tree>
 			</field>
 		</record>
@@ -77,6 +77,7 @@
                         <group>
                             <group>
                                 <field name="date" string="Date" readonly="1"/>
+                                <field name="partner_id" readonly="1"/>
                                 <field name="return_type" attrs="{'readonly': [('state', 'not in', 'draft')]}"/>
                                 <field name="operations"
                                        attrs="{'readonly': [('state', 'not in', 'draft')]}"/>
@@ -86,8 +87,8 @@
                                 <field name="ba_num" string="Nomor BA"/>
                                 <field name="notes"/>
                                 <field name="date_sales" readonly="1"/>
+                                <field name="date_finance" readonly="1"/>
                                 <field name="date_logistic" readonly="1"/>
-                                <field name="date_done" readonly="1"/>
                             </group>
                         </group>
                         <notebook>
-- 
cgit v1.2.3


From 365c9cbd0be8749873e4ec9953588d6b1b395677 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 23 Jul 2025 09:53:52 +0700
Subject: <miqdad> add ccm doc in SO

---
 indoteknik_custom/views/sale_order.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 2a159307..a45f1067 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -152,6 +152,9 @@
                         <field name="eta_date_start"/>
                         <field name="eta_date" readonly="1"/>
                     </group>
+                    <group string="Return Doc">
+                        <field name="ccm_id" readonly="1"/>
+                    </group>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']"
                        position="attributes">
-- 
cgit v1.2.3


From 1dbe906db264189b69a10633b3e7516650b3dfc5 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 23 Jul 2025 13:11:17 +0700
Subject: <miqdad> PO fix sequence on create and add vendor name

---
 indoteknik_custom/views/ir_sequence.xml     | 2 +-
 indoteknik_custom/views/tukar_guling_po.xml | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 03cfbc1a..257f0d27 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -204,7 +204,7 @@
 			<field name="name">Pengajuan Return SO</field>
 			<field name="code">tukar.guling</field>
             <field name="active">TRUE</field>
-            <field name="prefix">CCM/%(year)s/</field>
+            <field name="prefix">CCM/%(year)s/%(month)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/tukar_guling_po.xml b/indoteknik_custom/views/tukar_guling_po.xml
index 0e29e965..266f4eea 100644
--- a/indoteknik_custom/views/tukar_guling_po.xml
+++ b/indoteknik_custom/views/tukar_guling_po.xml
@@ -28,7 +28,7 @@
 					<field name="ba_num" string="Nomor BA"/>
 					<field name="return_type" string="Return Type"/>
 					<field name="state" widget="badge"
-						   decoration-info="state in ('draft', 'approval_purchase', 'approval_logistic','approval_finance')"
+						   decoration-info="state in ('draft', 'approval_purchase', 'approval_finance','approval_logistic')"
 						   decoration-success="state == 'done'"
 						   decoration-muted="state == 'cancel'"
 					/>
@@ -47,7 +47,7 @@
 								attrs="{'invisible': [('state', '!=', 'draft')]}"/>
 						<button name="action_approve" string="Approve" type="object"
 								class="btn-primary"
-								attrs="{'invisible': [('state', 'not in', ['approval_purchase', 'approval_logistic', 'approval_finance'])]}"/>
+								attrs="{'invisible': [('state', 'not in', ['approval_purchase', 'approval_finance', 'approval_logistic'])]}"/>
 						<button name="action_cancel" string="Cancel" type="object"
 								class="btn-secondary"
 								attrs="{'invisible': [('state', '=', 'cancel')]}"
@@ -76,6 +76,7 @@
 						</div>
 						<group>
 							<group>
+								<field name="vendor_id" readonly="1"/>
 								<field name="date" string="Date" readonly="1"/>
 								<field name="return_type"/>
 								<!--								<field name="ort_num" readonly="1"/>-->
@@ -109,6 +110,10 @@
 							</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>
-- 
cgit v1.2.3


From aa3b585bb0531c8d7af4402a58dd297ab2a17e9a Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 23 Jul 2025 13:34:28 +0700
Subject: <miqdad> approved date

---
 indoteknik_custom/views/tukar_guling_po.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling_po.xml b/indoteknik_custom/views/tukar_guling_po.xml
index 266f4eea..78bd9479 100644
--- a/indoteknik_custom/views/tukar_guling_po.xml
+++ b/indoteknik_custom/views/tukar_guling_po.xml
@@ -91,6 +91,9 @@
 							<group>
 								<field name="ba_num" string="Nomor BA"/>
 								<field name="notes"/>
+								<field name="date_purchase"/>
+								<field name="date_finance"/>
+								<field name="date_logistic"/>
 							</group>
 						</group>
 						<!-- Product Lines -->
-- 
cgit v1.2.3


From 55aa0eab16ee399694e0c2dc328aa268b11fcd97 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 23 Jul 2025 13:35:38 +0700
Subject: <miqdad> approved date

---
 indoteknik_custom/views/tukar_guling_po.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling_po.xml b/indoteknik_custom/views/tukar_guling_po.xml
index 78bd9479..6116687d 100644
--- a/indoteknik_custom/views/tukar_guling_po.xml
+++ b/indoteknik_custom/views/tukar_guling_po.xml
@@ -91,9 +91,9 @@
 							<group>
 								<field name="ba_num" string="Nomor BA"/>
 								<field name="notes"/>
-								<field name="date_purchase"/>
-								<field name="date_finance"/>
-								<field name="date_logistic"/>
+								<field name="date_purchase" readonly="1"/>
+								<field name="date_finance" readonly="1"/>
+								<field name="date_logistic" readonly="1"/>
 							</group>
 						</group>
 						<!-- Product Lines -->
-- 
cgit v1.2.3


From b75035f28dbb0443d4bacbbabde3b1c0b53b19d1 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 23 Jul 2025 13:38:29 +0700
Subject: <miqdad> change tree view

---
 indoteknik_custom/views/tukar_guling_po.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling_po.xml b/indoteknik_custom/views/tukar_guling_po.xml
index 6116687d..77feb05f 100644
--- a/indoteknik_custom/views/tukar_guling_po.xml
+++ b/indoteknik_custom/views/tukar_guling_po.xml
@@ -24,7 +24,9 @@
 				<tree create="1" delete="1" default_order="create_date desc">
 					<field name="name"/>
 					<field name="date"/>
+					<field name="origin" string="PO Number"/>
 					<field name="operations" string="Operations"/>
+					<field name="return_type" string="Return Type"/>
 					<field name="ba_num" string="Nomor BA"/>
 					<field name="return_type" string="Return Type"/>
 					<field name="state" widget="badge"
@@ -32,6 +34,7 @@
 						   decoration-success="state == 'done'"
 						   decoration-muted="state == 'cancel'"
 					/>
+					<field name="date_logistic" string="Approved Date"/>
 				</tree>
 			</field>
 		</record>
-- 
cgit v1.2.3


From 2b1ee134a0465f3982692c6b8d6a8ac4f60f4487 Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 23 Jul 2025 13:39:21 +0700
Subject: <miqdad> sequence

---
 indoteknik_custom/views/ir_sequence.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 257f0d27..776f7794 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -205,7 +205,7 @@
 			<field name="code">tukar.guling</field>
             <field name="active">TRUE</field>
             <field name="prefix">CCM/%(year)s/%(month)s/</field>
-			<field name="padding">5</field>
+			<field name="padding">4</field>
 			<field name="number_next">1</field>
 			<field name="number_increment">1</field>
 		</record>
@@ -213,8 +213,8 @@
             <field name="name">Pengajuan Return PO</field>
             <field name="code">tukar.guling.po</field>
             <field name="active">TRUE</field>
-            <field name="prefix">VCM/%(year)s/</field>
-            <field name="padding">5</field>
+            <field name="prefix">VCM/%(year)s/%(month)s/</field>
+            <field name="padding">4</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
-- 
cgit v1.2.3


From f8b95c402ca5850448fa6fd4fd59cdd21e49850b Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Wed, 23 Jul 2025 14:03:51 +0700
Subject: <miqdad> show vcm in PO

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index dae23eed..ff223125 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -189,6 +189,13 @@
                         <field name="order_sales_match_line"/>
                     </page>
                 </xpath>
+                <xpath expr="//form/sheet/notebook/page[@name='purchase_delivery_invoice']" position="after">
+                    <page string="Other Info" name="purchase_order_sales_matches_lines">
+                        <group string="Return Doc">
+                            <field name="vcm_id"/>
+                        </group>
+                    </page>
+                </xpath>
             </field>
         </record>
     </data>
-- 
cgit v1.2.3


From deb60713ed39979b34083ee094de79fa3afac3b8 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Wed, 23 Jul 2025 14:50:10 +0700
Subject: <hafid> Refund System

---
 indoteknik_custom/views/account_move.xml      |   4 +-
 indoteknik_custom/views/ir_sequence.xml       |  10 ++
 indoteknik_custom/views/refund_sale_order.xml | 199 ++++++++++++++++++++++++++
 indoteknik_custom/views/sale_order.xml        |  38 ++++-
 4 files changed, 249 insertions(+), 2 deletions(-)
 create mode 100644 indoteknik_custom/views/refund_sale_order.xml

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 2f52b3d9..ae944a4a 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -36,7 +36,9 @@
                     <!-- <field name="purchase_order_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"/> -->
                 </field>
                 <field name="ref" position="after">
-                    <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
+                    <field name="sale_id" readonly="1" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('has_refund_so', '=', True)]}"/>
+                    <field name="refund_so_links" readonly="1" widget="html" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('has_refund_so', '=', False)]}"/>
+                    <field name="has_refund_so" invisible="1"/>
                 </field>
                 <field name="reklas_misc_id" position="after">
                     <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/>
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index a0f5fc6b..a4c98e3f 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -200,5 +200,15 @@
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
+
+        <record id="seq_refund_sale_order" model="ir.sequence">
+            <field name="name">Refund Sale Order</field>
+            <field name="code">refund.sale.order</field>
+            <field name="prefix">RC/%(year)s/%(month)s/</field>
+            <field name="padding">4</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="active">True</field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
new file mode 100644
index 00000000..3b348730
--- /dev/null
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <!-- Tree View -->
+    <record id="view_refund_sale_order_tree" model="ir.ui.view">
+        <field name="name">refund.sale.order.tree</field>
+        <field name="model">refund.sale.order</field>
+        <field name="arch" type="xml">
+            <tree string="Refund Sales Orders">
+                <field name="name" readonly="1"/>
+                <field name="created_date" readonly="1"/>
+                <field name="partner_id" readonly="1"/>
+                <field name="sale_order_ids" widget="many2many_tags" readonly="1"/>
+                <field name="uang_masuk" readonly="1"/>
+                <field name="ongkir" readonly="1"/>
+                <field name="total_invoice" readonly="1"/>
+                <field name="amount_refund" readonly="1"/>
+                <field name="status"
+                    decoration-info="status == 'draft'" 
+                    decoration-danger="status == 'reject'" 
+                    decoration-success="status == 'refund'" 
+                    decoration-warning="status == 'pengajuan1' or status == 'pengajuan2' or status == 'pengajuan3'"
+                    widget="badge"
+                    readonly="1"/>
+                <field name="status_payment" 
+                    decoration-info="status_payment == 'pending'" 
+                    decoration-danger="status_payment == 'reject'" 
+                    decoration-success="status_payment == 'done'" 
+                    widget="badge"
+                    readonly="1"/>
+                <field name="refund_date" readonly="1"/>
+                <field name="amount_refund_text" readonly="1" optional="hide"/>
+                <field name="invoice_ids" readonly="1" optional="hide"/>
+                <field name="refund_type" readonly="1" optional="hide"/>
+                <field name="user_ids" readonly="1" optional="hide"/>
+            </tree>
+        </field>
+    </record>
+
+    <!-- Form View -->
+    <record id="view_refund_sale_order_form" model="ir.ui.view">
+        <field name="name">refund.sale.order.form</field>
+        <field name="model">refund.sale.order</field>
+        <field name="arch" type="xml">
+            <form string="Refund Sales Order">
+                <header>
+                    <button name="action_ask_approval"
+                            type="object"
+                            string="Ask Approval"
+                            attrs="{'invisible': [('status', '!=', 'draft')]}"/>
+
+                    <button name="action_approve_flow"
+                            type="object"
+                            string="Approve"
+                            class="oe_highlight"
+                            attrs="{'invisible': [('status', 'in', ['refund', 'reject', 'draft'])]}"/>
+                    <button name="action_trigger_cancel"
+                            type="object"
+                            string="Cancel"
+                            attrs="{'invisible': ['|', ('status_payment', '!=', 'pending'), ('status', '=', 'reject')]}" />
+                    <button name="action_confirm_refund"
+                            type="object"
+                            string="Confirm Refund"
+                            class="btn-primary"
+                            attrs="{'invisible': ['|', ('status', 'not in', ['pengajuan3','refund']), ('status_payment', '!=', 'pending')]}"/>
+                    <button name="action_create_journal_refund"
+                            string="Journal Refund"
+                            type="object"
+                            class="oe_highlight"
+                            attrs="{'invisible': ['|', ('status', 'not in', ['pengajuan3','refund']), ('journal_refund_state', '=', 'posted')]}"/>
+
+                    <field name="status"
+                        widget="statusbar"
+                        statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,reject"
+                        attrs="{'invisible': [('status', '!=', 'reject')]}" />
+
+                    <field name="status"
+                        widget="statusbar"
+                        statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,refund"
+                        attrs="{'invisible': [('status', '=', 'reject')]}" />
+                </header>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button name="action_open_journal_refund"
+                                type="object"
+                                class="oe_stat_button"
+                                icon="fa-book"
+                                width="250px"
+                                attrs="{'invisible': ['|', ('journal_refund_move_id', '=', False), ('journal_refund_state', '!=', 'posted')]}">
+                            <field name="journal_refund_move_id" string="Journal Refund" widget="statinfo"/>
+                        </button>
+                    </div>
+                    <widget name="web_ribbon"
+                            title="PAID"
+                            bg_color="bg-success"
+                            attrs="{'invisible': [('status_payment', '!=', 'done')]}"/>
+
+                    <widget name="web_ribbon"
+                            title="CANCEL"
+                            bg_color="bg-danger"
+                            attrs="{'invisible': [('status_payment', '!=', 'reject')]}"/>
+                    <h1>
+                        <field name="name" readonly="1"/>
+                    </h1>
+                    <group col="2">
+                        <group>
+                            <field name="is_locked" invisible="1"/>
+                            <field name="status_payment" invisible="1"/>
+                            <field name="journal_refund_state" invisible="1"/>
+                            
+                            <field name="partner_id" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                            <field name="sale_order_ids" widget="many2many_tags" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                            <field name="invoice_ids" widget="many2many_tags" readonly="1"/>
+                            <field name="invoice_names" widget="html" readonly="1"/>
+                            <field name="so_names" widget="html" readonly="1"/>
+                            <field name="advance_move_names" widget="html" readonly="1"/>
+                            <field name="refund_type" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                            <field name="note_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                        </group>
+                        <group>
+                            <field name="uang_masuk" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                            <field name="total_invoice" readonly="1"/>
+                            <field name="ongkir" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                            <field name="amount_refund" readonly="1"/>
+                            <field name="amount_refund_text" readonly="1"/>
+                            <field name="uang_masuk_type" required="1" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                            <field name="bukti_uang_masuk_image" widget="image" 
+                                attrs="{'invisible': [('uang_masuk_type', '=', 'pdf')], 'readonly': [('is_locked', '=', True)]}"/>
+                            <field name="bukti_uang_masuk_pdf" widget="pdf_viewer" 
+                                attrs="{'invisible': [('uang_masuk_type', '=', 'image')], 'readonly': [('is_locked', '=', True)]}"/>
+                        </group>
+                    </group>
+
+                    <notebook>
+                        <page string="Produk Line">
+                            <field name="line_ids" attrs="{'readonly': [('is_locked', '=', True)]}">
+                                <tree editable="bottom">
+                                    <field name="product_id"/>
+                                    <field name="quantity"/>
+                                    <field name="reason"/>
+                                </tree>
+                            </field>
+                        </page>
+
+                        <page string="Other Info">
+                            <group col="2">
+                                <group>
+                                    <field name="user_ids" widget="many2many_tags" readonly="1"/>
+                                    <field name="created_date" readonly="1"/>
+                                    <field name="refund_date" attrs="{'readonly': [('status', 'not in', ['pengajuan3','refund'])]}"/>
+                                </group>
+                                <group>
+                                    <field name="bank" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                                    <field name="account_name" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                                    <field name="account_no" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                                </group>
+                            </group>
+                        </page>
+
+                        <page string="Finance Note">
+                            <group col="2">
+                                <group>
+                                    <field name="finance_note" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                                </group>
+                                <group>
+                                    <field name="bukti_refund_type"  reqiured="1" attrs="{'readonly': [('is_locked', '=', True)]}"/>
+                                    <field name="bukti_transfer_refund_pdf"  widget="pdf_viewer" attrs="{'invisible': [('bukti_refund_type', '=', 'image')]}"/>
+                                    <field name="bukti_transfer_refund_image"  widget="image" attrs="{'invisible': [('bukti_refund_type', '=', 'pdf')]}"/>
+                                </group>
+                            </group>
+                        </page>
+
+                        <page string="Cancel Reason" attrs="{'invisible': [('status', '=', 'refund')]}">
+                            <group>
+                                <field name="reason_reject"/>
+                            </group>
+                        </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>
+    <!-- Action -->
+    <record id="action_refund_sale_order" model="ir.actions.act_window">
+        <field name="name">Refund Sales Order</field>
+        <field name="res_model">refund.sale.order</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <!-- Menu -->
+    <menuitem id="menu_refund_sale_order"
+              name="Refund"
+              parent="sale.sale_order_menu"
+              sequence="10"
+              action="action_refund_sale_order"/>
+</odoo>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 2a159307..bb8bdc08 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -35,7 +35,32 @@
                             string="UangMuka"
                             type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
                 </button>
-                <field name="payment_term_id" position="after">
+                <xpath expr="//header" position="inside">
+                    <button name="button_refund"
+                        type="object"
+                        string="Refund"
+                        class="btn-primary"
+                        attrs="{'invisible': ['|', ('state', 'not in', ['sale', 'done']), ('has_refund', '=', True)]}" />
+                </xpath>
+                <div class="oe_button_box" name="button_box">
+                    <button name="action_open_advance_payment_move"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-book"
+                            width="250px"
+                            attrs="{'invisible': [('advance_payment_move_id','=',False)]}">
+                        <field name="advance_payment_move_id" string="Journal Uang Muka" widget="statinfo"/>
+                    </button>
+
+                    <button type="object"
+                            name="action_view_related_refunds"
+                            class="oe_stat_button"
+                            icon="fa-refresh"
+                            attrs="{'invisible': [('refund_count', '=', 0)]}">
+                        <field name="refund_count" widget="statinfo" string="Refund"/>
+                    </button>
+                </div>
+                    <field name="payment_term_id" position="after">
                     <field name="create_uid" invisible="1"/>
                     <field name="create_date" invisible="1"/>
                     <field name="shipping_cost_covered"
@@ -151,6 +176,7 @@
                         <field name="expected_ready_to_ship"/>
                         <field name="eta_date_start"/>
                         <field name="eta_date" readonly="1"/>
+                        <field name="has_refund" readonly="1"/>
                     </group>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']"
@@ -632,6 +658,16 @@
         </record>
     </data>
 
+    <data>
+        <record id="sale_order_multi_create_refund_ir_actions_server" model="ir.actions.server">
+            <field name="name">Refund</field>
+            <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_refund()</field>
+        </record>
+    </data>
+
     <data>
         <record id="mail_template_sale_order_notification_to_salesperson" model="mail.template">
             <field name="name">Sale Order: Notification to Salesperson</field>
-- 
cgit v1.2.3


From dbe66f04df0fa1809ed015b7a6993697b482106d Mon Sep 17 00:00:00 2001
From: Miqdad <ahmadmiqdad27@gmail.com>
Date: Thu, 24 Jul 2025 10:08:02 +0700
Subject: <miqdad> move to order

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/tukar_guling.xml b/indoteknik_custom/views/tukar_guling.xml
index 95f36090..a79f8b55 100644
--- a/indoteknik_custom/views/tukar_guling.xml
+++ b/indoteknik_custom/views/tukar_guling.xml
@@ -12,8 +12,8 @@
 		<menuitem
 				id="menu_pengajuan_tukar_guling"
 				name="Pengajuan Return SO"
-				parent="sale.menu_sale_report"
-				sequence="3"
+				parent="sale.sale_order_menu"
+				sequence="7"
 				action="action_pengajuan_tukar_guling"
 		/>
 		<!-- Tree View -->
-- 
cgit v1.2.3


From 365bf9fd1d6cff481c24342db44ef9aeffdd7d80 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 24 Jul 2025 10:52:36 +0700
Subject: <hafid> editable field

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/refund_sale_order.xml b/indoteknik_custom/views/refund_sale_order.xml
index 3b348730..4f791722 100644
--- a/indoteknik_custom/views/refund_sale_order.xml
+++ b/indoteknik_custom/views/refund_sale_order.xml
@@ -118,9 +118,9 @@
                         </group>
                         <group>
                             <field name="uang_masuk" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="total_invoice" readonly="1"/>
+                            <field name="total_invoice" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="ongkir" attrs="{'readonly': [('is_locked', '=', True)]}"/>
-                            <field name="amount_refund" readonly="1"/>
+                            <field name="amount_refund" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="amount_refund_text" readonly="1"/>
                             <field name="uang_masuk_type" required="1" attrs="{'readonly': [('is_locked', '=', True)]}"/>
                             <field name="bukti_uang_masuk_image" widget="image" 
-- 
cgit v1.2.3


From 3b89a146b2e77619712de062481abe6e5c2298dd Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 24 Jul 2025 12:01:49 +0700
Subject: <hafid> undo refund system

---
 indoteknik_custom/views/account_move.xml |  6 +++---
 indoteknik_custom/views/sale_order.xml   | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index ae944a4a..59e89210 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -36,9 +36,9 @@
                     <!-- <field name="purchase_order_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"/> -->
                 </field>
                 <field name="ref" position="after">
-                    <field name="sale_id" readonly="1" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('has_refund_so', '=', True)]}"/>
-                    <field name="refund_so_links" readonly="1" widget="html" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('has_refund_so', '=', False)]}"/>
-                    <field name="has_refund_so" invisible="1"/>
+                    <field name="sale_id" readonly="1" attrs="{'invisible': ['|', ('move_type', '!=', 'entry')]}"/>
+                    <!-- <field name="refund_so_links" readonly="1" widget="html" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('has_refund_so', '=', False)]}"/>
+                    <field name="has_refund_so" invisible="1"/> -->
                 </field>
                 <field name="reklas_misc_id" position="after">
                     <field name="purchase_order_id" context="{'form_view_ref': 'purchase.purchase_order_form'}" options="{'no_create': True}"/>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index bb8bdc08..346dc0f8 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -35,13 +35,13 @@
                             string="UangMuka"
                             type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
                 </button>
-                <xpath expr="//header" position="inside">
+                <!-- <xpath expr="//header" position="inside">
                     <button name="button_refund"
                         type="object"
                         string="Refund"
                         class="btn-primary"
                         attrs="{'invisible': ['|', ('state', 'not in', ['sale', 'done']), ('has_refund', '=', True)]}" />
-                </xpath>
+                </xpath> -->
                 <div class="oe_button_box" name="button_box">
                     <button name="action_open_advance_payment_move"
                             type="object"
@@ -52,13 +52,13 @@
                         <field name="advance_payment_move_id" string="Journal Uang Muka" widget="statinfo"/>
                     </button>
 
-                    <button type="object"
+                    <!-- <button type="object"
                             name="action_view_related_refunds"
                             class="oe_stat_button"
                             icon="fa-refresh"
                             attrs="{'invisible': [('refund_count', '=', 0)]}">
                         <field name="refund_count" widget="statinfo" string="Refund"/>
-                    </button>
+                    </button> -->
                 </div>
                     <field name="payment_term_id" position="after">
                     <field name="create_uid" invisible="1"/>
@@ -176,7 +176,7 @@
                         <field name="expected_ready_to_ship"/>
                         <field name="eta_date_start"/>
                         <field name="eta_date" readonly="1"/>
-                        <field name="has_refund" readonly="1"/>
+                        <!-- <field name="has_refund" readonly="1"/> -->
                     </group>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']"
@@ -658,7 +658,7 @@
         </record>
     </data>
 
-    <data>
+    <!-- <data>
         <record id="sale_order_multi_create_refund_ir_actions_server" model="ir.actions.server">
             <field name="name">Refund</field>
             <field name="model_id" ref="sale.model_sale_order"/>
@@ -666,7 +666,7 @@
             <field name="state">code</field>
             <field name="code">action = records.open_form_multi_create_refund()</field>
         </record>
-    </data>
+    </data> -->
 
     <data>
         <record id="mail_template_sale_order_notification_to_salesperson" model="mail.template">
-- 
cgit v1.2.3


From 05d63523d021deb820724b90b1c36411d270f39f Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 24 Jul 2025 13:12:31 +0700
Subject: <hafid> undo refund system

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 59e89210..9b1c791b 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -36,7 +36,7 @@
                     <!-- <field name="purchase_order_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"/> -->
                 </field>
                 <field name="ref" position="after">
-                    <field name="sale_id" readonly="1" attrs="{'invisible': ['|', ('move_type', '!=', 'entry')]}"/>
+                    <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
                     <!-- <field name="refund_so_links" readonly="1" widget="html" attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), ('has_refund_so', '=', False)]}"/>
                     <field name="has_refund_so" invisible="1"/> -->
                 </field>
-- 
cgit v1.2.3


From cbe2c5730bcd82ce594e03425c987b17c583b893 Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Thu, 24 Jul 2025 14:44:23 +0700
Subject: <hafid> add journals in so

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

(limited to 'indoteknik_custom/views')

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 346dc0f8..5bcd7641 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -43,13 +43,13 @@
                         attrs="{'invisible': ['|', ('state', 'not in', ['sale', 'done']), ('has_refund', '=', True)]}" />
                 </xpath> -->
                 <div class="oe_button_box" name="button_box">
-                    <button name="action_open_advance_payment_move"
+                    <field name="advance_payment_move_ids" invisible="1"/>
+                    <button name="action_open_advance_payment_moves"
                             type="object"
                             class="oe_stat_button"
                             icon="fa-book"
-                            width="250px"
-                            attrs="{'invisible': [('advance_payment_move_id','=',False)]}">
-                        <field name="advance_payment_move_id" string="Journal Uang Muka" widget="statinfo"/>
+                            attrs="{'invisible': [('advance_payment_move_ids', '=', [])]}">
+                        <field name="advance_payment_move_count" widget="statinfo" string="Journals"/>
                     </button>
 
                     <!-- <button type="object"
-- 
cgit v1.2.3