From 96cb47f78e7847bb7d0ceec20fc8d275e9a916d8 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 2 Oct 2025 15:08:54 +0700
Subject: (andri) rename downpayment to advance payment request

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

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
new file mode 100644
index 00000000..1610293f
--- /dev/null
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_form_advance_payment_request" model="ir.ui.view">
+        <field name="name">advance.payment.request.form</field>
+        <field name="model">advance.payment.request</field>
+        <field name="arch" type="xml">
+            <form string="Advance Payment Request (APR)">
+                <header>
+                    <button name="action_realisasi_pum"
+                        type="object"
+                        string="Settlement"
+                        class="btn-primary"
+                        attrs="{'invisible': [('status', 'not in', 'approved')]}"/>
+                    <button name="action_draft"
+                            string="Reset to Draft"
+                            attrs="{'invisible': [('status', '!=', 'reject')]}"
+                            type="object"/>                    
+                    <button name="action_reject"
+                        type="object"
+                        string="Reject"
+                        class="btn-danger"
+                        attrs="{'invisible': [('status', 'in', ['approved','reject','draft'])]}"/>
+                    <button name="action_approval_check"
+                        type="object"
+                        string="Checking/Approval"
+                        class="btn-success"
+                         attrs="{'invisible': [('status', 'in', ['approved','reject','draft'])]}"/>
+                    <button name="action_confirm_payment"
+                        type="object"
+                        string="Konfirmasi Pembayaran"
+                        class="btn-info"
+                        attrs="{'invisible': ['|', ('status', '=', 'reject'), ('status_pay_down_payment', '=', 'payment')]}"/>
+                    <button name="action_ap_only"
+                        type="object"
+                        string="AP Only"
+                        class="btn-info"
+                        attrs="{'invisible': ['|', ('status', '=', 'reject'), ('is_cab_visible', '=', True)]}"/>
+                    <field name="status" widget="statusbar"
+                        statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,approved"
+                        statusbar_colors='{"reject":"red"}'
+                        readonly="1"/>
+                </header>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <field name="is_cab_visible" invisible="1"/>
+                        <button type="object"
+                            name="action_view_journal_uangmuka"
+                            class="oe_stat_button"
+                            icon="fa-book"
+                            attrs="{'invisible': [('is_cab_visible', '=', 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>
+                    </div>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="number" readonly="1"/>
+                        </h1>
+                    </div>
+                    <group col="2">
+                        <group string="">
+                            <field name="applicant_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="nominal" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="bank_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="account_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="bank_account" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="detail_note" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <hr/>
+                            <field name="user_id" readonly="1"/>
+                            <field name="partner_id" readonly="1"/>
+                            <field name="departement_type"/>
+                            <field name="status_pay_down_payment"
+                                readonly="1"
+                                decoration-success="status_pay_down_payment == 'payment'"
+                                decoration-danger="status_pay_down_payment == 'pending'"
+                                widget="badge"/>
+                            <field name="create_date" readonly="1"/>
+                            <field name="date_back_to_office"/>
+                            <field name="estimated_return_date"  readonly="1" widget="badge"/>
+                            <field name="days_remaining" readonly="1" widget="badge"/>
+                            <field name="approved_by" readonly="1"/>
+                            <field name="reason_reject" attrs="{'invisible': [('status', '!=', 'reject')], 'readonly': True}"/>
+                        </group>
+
+                        <group>
+                            <field name="attachment_type" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+
+                            <field name="attachment_file_pdf" filename="attachment_filename"
+                                widget="pdf_viewer"
+                                attrs="{'invisible': [('attachment_type', '!=', 'pdf')], 'readonly': [('status', '=', 'approved')]}"/>
+
+                            <field name="attachment_file_image" filename="attachment_filename"
+                                widget="image"
+                                attrs="{'invisible': [('attachment_type', '!=', 'image')], 'readonly': [('status', '=', 'approved')]}"
+                                style="max-width:250px; max-height:250px; object-fit:contain;"/>
+                            <br/>
+                        </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="view_tree_advance_payment_request" model="ir.ui.view">
+        <field name="name">advance.payment.request.tree</field>
+        <field name="model">advance.payment.request</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="number"/>
+                <field name="user_id" optional='hide'/>
+                <field name="applicant_name"/>
+                <field name="nominal"/>
+                <field name="departement_type" optional='hide'/>
+                <field name="status"
+                    readonly="1"
+                    decoration-success="status == 'approved'"
+                    decoration-danger="status == 'reject'"
+                    widget="badge" optional="show"/>
+                <field name="status_pay_down_payment"
+                    readonly="1"
+                    decoration-success="status_pay_down_payment == 'payment'"
+                    decoration-danger="status_pay_down_payment == 'pending'"
+                    widget="badge"/>
+                <field name="days_remaining" readonly="1" widget="badge" optional="hide"/>
+                <field name="estimated_return_date" widget="badge" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_advance_payment_request" model="ir.actions.act_window">
+        <field name="name">Advance Payment Request</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">advance.payment.request</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_advance_payment_request_acct"
+        name="Advance Payment Request"
+        parent="account.menu_finance_entries"
+        sequence="114"
+        action="action_advance_payment_request"
+    />
+    
+    <menuitem id="menu_advance_payment_request_sales"
+        name="Advance Payment Request"
+        parent="sale.product_menu_catalog"
+        sequence="101"
+        action="action_advance_payment_request"
+    />
+
+    <record id="view_advance_payment_create_bill_form" model="ir.ui.view">
+        <field name="name">advance.payment.create.bill.form</field>
+        <field name="model">advance.payment.create.bill</field>
+        <field name="arch" type="xml">
+            <form string="Create CAB AP Only">
+                <group>
+                    <field name="nominal"/>
+                    <field name="account_id"/>
+                </group>
+                <footer>
+                    <button name="action_create_cab" type="object" string="Create CAB" class="btn-primary"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_advance_payment_create_bill" model="ir.actions.act_window">
+        <field name="name">Create CAB AP Only</field>
+        <field name="res_model">advance.payment.create.bill</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_advance_payment_create_bill_form"/>
+        <field name="target">new</field>
+    </record>
+
+    <record id="view_advance_payment_request_reject_form" model="ir.ui.view">
+        <field name="name">advance.payment.request.reject.form</field>
+        <field name="model">advance.payment.request.reject</field>
+        <field name="arch" type="xml">
+            <form string="Alasan Penolakan APR">
+                <group>
+                    <field name="reason_reject"/>
+                </group>
+                <footer>
+                    <button name="confirm_reject" type="object" string="Tolak" class="btn-danger"/>
+                    <button string="Batal" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_advance_payment_request_reject" model="ir.actions.act_window">
+        <field name="name">Tolak Pengajuan APR</field>
+        <field name="res_model">advance.payment.request.reject</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
+</odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From 017c502380045ee8212932b25f9f94ee2e7b0c40 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 7 Oct 2025 13:19:52 +0700
Subject: (andri) add type request

---
 .../views/advance_payment_request.xml              | 36 +++++++++++++---------
 1 file changed, 21 insertions(+), 15 deletions(-)

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 1610293f..20f43961 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -62,15 +62,18 @@
                     </div>
                     <group col="2">
                         <group string="">
+                            <field name="type_request" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="applicant_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="nominal" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="bank_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="account_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="bank_account" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="detail_note" attrs="{'readonly': [('status', '=', 'approved')]}"/>
-                            <hr/>
+                        </group>
+
+                        <group>
                             <field name="user_id" readonly="1"/>
-                            <field name="partner_id" readonly="1"/>
+                            <!-- <field name="partner_id" readonly="1"/> -->
                             <field name="departement_type"/>
                             <field name="status_pay_down_payment"
                                 readonly="1"
@@ -85,20 +88,23 @@
                             <field name="reason_reject" attrs="{'invisible': [('status', '!=', 'reject')], 'readonly': True}"/>
                         </group>
 
-                        <group>
-                            <field name="attachment_type" attrs="{'readonly': [('status', '=', 'approved')]}"/>
-
-                            <field name="attachment_file_pdf" filename="attachment_filename"
-                                widget="pdf_viewer"
-                                attrs="{'invisible': [('attachment_type', '!=', 'pdf')], 'readonly': [('status', '=', 'approved')]}"/>
-
-                            <field name="attachment_file_image" filename="attachment_filename"
-                                widget="image"
-                                attrs="{'invisible': [('attachment_type', '!=', 'image')], 'readonly': [('status', '=', 'approved')]}"
-                                style="max-width:250px; max-height:250px; object-fit:contain;"/>
-                            <br/>
-                        </group>
+                        <notebook>
+                            <page string="Attachment">
+                                <field name="attachment_type" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                                <field name="attachment_file_pdf" filename="attachment_filename"
+                                    widget="pdf_viewer"
+                                    attrs="{'invisible': [('attachment_type', '!=', 'pdf')], 'readonly': [('status', '=', 'approved')]}"/>
 
+                                <field name="attachment_file_image" filename="attachment_filename"
+                                    widget="image"
+                                    attrs="{'invisible': [('attachment_type', '!=', 'image')], 'readonly': [('status', '=', 'approved')]}"
+                                    style="max-width:250px; max-height:250px; object-fit:contain;"/>
+                                <br/>
+                            </page>
+                            <page string="Reimburse" attrs="{'invisible': [('type_request', '!=', 'reimburse')]}">
+                                <h1>Hello World HEHE</h1>
+                            </page>
+                        </notebook>
                     </group>
                 </sheet>
                 <div class="oe_chatter">
-- 
cgit v1.2.3


From aa754e863440d7fb8884649e53a5961124a4dbbd Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Wed, 8 Oct 2025 14:43:49 +0700
Subject: (andri) fix view + dll

---
 .../views/advance_payment_request.xml              | 34 ++++++++++++----------
 1 file changed, 18 insertions(+), 16 deletions(-)

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 20f43961..0c851d78 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -29,18 +29,20 @@
                         type="object"
                         string="Konfirmasi Pembayaran"
                         class="btn-info"
-                        attrs="{'invisible': ['|', ('status', '=', 'reject'), ('status_pay_down_payment', '=', 'payment')]}"/>
+                        attrs="{'invisible': ['|', ('status', 'in', ['reject','draft']), ('status_pay_down_payment', '=', 'payment')]}"/>
                     <button name="action_ap_only"
                         type="object"
                         string="AP Only"
                         class="btn-info"
-                        attrs="{'invisible': ['|', ('status', '=', 'reject'), ('is_cab_visible', '=', True)]}"/>
+                        attrs="{'invisible': ['|', ('status', 'in', ['approved','reject','draft']), ('is_cab_visible', '=', True)]}"/>
                     <field name="status" widget="statusbar"
                         statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,approved"
                         statusbar_colors='{"reject":"red"}'
                         readonly="1"/>
                 </header>
                 <sheet>
+                    <widget name="web_ribbon" title="Payment" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'payment'), ('status', '=', 'draft')]}"/>
+                    <widget name="web_ribbon" title="Pending" bg_color="bg-danger" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'pending'), ('status', '=', 'draft')]}"/>
                     <div class="oe_button_box" name="button_box">
                         <field name="is_cab_visible" invisible="1"/>
                         <button type="object"
@@ -69,28 +71,26 @@
                             <field name="account_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="bank_account" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="detail_note" attrs="{'readonly': [('status', '=', 'approved')]}"/>
-                        </group>
-
-                        <group>
+                            <br/>
                             <field name="user_id" readonly="1"/>
+                            <field name="position_type" readonly="1"/>
                             <!-- <field name="partner_id" readonly="1"/> -->
                             <field name="departement_type"/>
-                            <field name="status_pay_down_payment"
-                                readonly="1"
-                                decoration-success="status_pay_down_payment == 'payment'"
-                                decoration-danger="status_pay_down_payment == 'pending'"
-                                widget="badge"/>
-                            <field name="create_date" readonly="1"/>
+                            
                             <field name="date_back_to_office"/>
                             <field name="estimated_return_date"  readonly="1" widget="badge"/>
                             <field name="days_remaining" readonly="1" widget="badge"/>
                             <field name="approved_by" readonly="1"/>
+                            <field name="create_date" readonly="1"/>
+                            <field name="status_pay_down_payment"
+                                readonly="1"
+                                decoration-success="status_pay_down_payment == 'payment'"
+                                decoration-danger="status_pay_down_payment == 'pending'"
+                                widget="badge" invisible = "1"/>
                             <field name="reason_reject" attrs="{'invisible': [('status', '!=', 'reject')], 'readonly': True}"/>
                         </group>
-
-                        <notebook>
-                            <page string="Attachment">
-                                <field name="attachment_type" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                        <group>
+                            <field name="attachment_type" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                                 <field name="attachment_file_pdf" filename="attachment_filename"
                                     widget="pdf_viewer"
                                     attrs="{'invisible': [('attachment_type', '!=', 'pdf')], 'readonly': [('status', '=', 'approved')]}"/>
@@ -100,7 +100,9 @@
                                     attrs="{'invisible': [('attachment_type', '!=', 'image')], 'readonly': [('status', '=', 'approved')]}"
                                     style="max-width:250px; max-height:250px; object-fit:contain;"/>
                                 <br/>
-                            </page>
+                        </group>
+
+                        <notebook>
                             <page string="Reimburse" attrs="{'invisible': [('type_request', '!=', 'reimburse')]}">
                                 <h1>Hello World HEHE</h1>
                             </page>
-- 
cgit v1.2.3


From 585fefbd00baf8a6fca7aeac1c845a7400fb5d2b Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Wed, 8 Oct 2025 15:57:04 +0700
Subject: (andri) fix

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

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 0c851d78..42736f6a 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -4,7 +4,7 @@
         <field name="name">advance.payment.request.form</field>
         <field name="model">advance.payment.request</field>
         <field name="arch" type="xml">
-            <form string="Advance Payment Request (APR)">
+            <form string="Advance Payment Request &amp; Reimburse">
                 <header>
                     <button name="action_realisasi_pum"
                         type="object"
@@ -144,21 +144,21 @@
     </record>
 
     <record id="action_advance_payment_request" model="ir.actions.act_window">
-        <field name="name">Advance Payment Request</field>
+        <field name="name">Advance Payment Request &amp; Reimburse</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">advance.payment.request</field>
         <field name="view_mode">tree,form</field>
     </record>
 
     <menuitem id="menu_advance_payment_request_acct"
-        name="Advance Payment Request"
+        name="Advance Payment Request &amp; Reimburse"
         parent="account.menu_finance_entries"
         sequence="114"
         action="action_advance_payment_request"
     />
     
     <menuitem id="menu_advance_payment_request_sales"
-        name="Advance Payment Request"
+        name="Advance Payment Request &amp; Reimburse"
         parent="sale.product_menu_catalog"
         sequence="101"
         action="action_advance_payment_request"
-- 
cgit v1.2.3


From ff4ec105fbd2cffda3b6d8bef2b4549561ba93e7 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Thu, 9 Oct 2025 16:36:46 +0700
Subject: (andri) change type field + add field PUM perjalanan

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

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 42736f6a..0ec5900a 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -63,7 +63,7 @@
                         </h1>
                     </div>
                     <group col="2">
-                        <group string="">
+                        <group string=" ">
                             <field name="type_request" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="applicant_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="nominal" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
@@ -76,9 +76,9 @@
                             <field name="position_type" readonly="1"/>
                             <!-- <field name="partner_id" readonly="1"/> -->
                             <field name="departement_type"/>
-                            
-                            <field name="date_back_to_office"/>
-                            <field name="estimated_return_date"  readonly="1" widget="badge"/>
+                            <field name="apr_perjalanan" attrs="{'invisible': [('type_request', '=', 'reimburse')]}"/>
+                            <field name="date_back_to_office" attrs="{'invisible': [('apr_perjalanan', '=', False)]}"/>
+                            <field name="estimated_return_date" readonly="1" widget="badge" attrs="{'invisible': [('apr_perjalanan', '=', False)]}"/>
                             <field name="days_remaining" readonly="1" widget="badge"/>
                             <field name="approved_by" readonly="1"/>
                             <field name="create_date" readonly="1"/>
@@ -89,7 +89,7 @@
                                 widget="badge" invisible = "1"/>
                             <field name="reason_reject" attrs="{'invisible': [('status', '!=', 'reject')], 'readonly': True}"/>
                         </group>
-                        <group>
+                        <group string="Bukti Transfer">
                             <field name="attachment_type" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                                 <field name="attachment_file_pdf" filename="attachment_filename"
                                     widget="pdf_viewer"
-- 
cgit v1.2.3


From ede22cbc80eed8b142457fe9779dcd61374f5c93 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Fri, 10 Oct 2025 09:30:55 +0700
Subject: (andri) penyesuaian jabatan dan department + fix view

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

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 0ec5900a..134ec9bf 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -29,12 +29,12 @@
                         type="object"
                         string="Konfirmasi Pembayaran"
                         class="btn-info"
-                        attrs="{'invisible': ['|', ('status', 'in', ['reject','draft']), ('status_pay_down_payment', '=', 'payment')]}"/>
+                        attrs="{'invisible': ['|', ('status', 'not in', ['approved']), ('status_pay_down_payment', '=', 'payment')]}"/>
                     <button name="action_ap_only"
                         type="object"
-                        string="AP Only"
+                        string="Make CAB"
                         class="btn-info"
-                        attrs="{'invisible': ['|', ('status', 'in', ['approved','reject','draft']), ('is_cab_visible', '=', True)]}"/>
+                        attrs="{'invisible': ['|', ('status', 'not in', ['approved']), ('is_cab_visible', '=', True)]}"/>
                     <field name="status" widget="statusbar"
                         statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,approved"
                         statusbar_colors='{"reject":"red"}'
@@ -66,6 +66,7 @@
                         <group string=" ">
                             <field name="type_request" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="applicant_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="position_type" readonly="1"/>
                             <field name="nominal" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="bank_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="account_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
@@ -73,11 +74,12 @@
                             <field name="detail_note" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <br/>
                             <field name="user_id" readonly="1"/>
-                            <field name="position_type" readonly="1"/>
+                            <!-- <field name="position_type" readonly="1"/> -->
                             <!-- <field name="partner_id" readonly="1"/> -->
                             <field name="departement_type"/>
                             <field name="apr_perjalanan" attrs="{'invisible': [('type_request', '=', 'reimburse')]}"/>
                             <field name="date_back_to_office" attrs="{'invisible': [('apr_perjalanan', '=', False)]}"/>
+                            <p style="font-size: 10px; color: grey; font-style: italic" attrs="{'invisible': [('apr_perjalanan', '=', False)]}">*Setelah tanggal kembali, pemohon diharapkan untuk segera memproses realisasi PUM</p>
                             <field name="estimated_return_date" readonly="1" widget="badge" attrs="{'invisible': [('apr_perjalanan', '=', False)]}"/>
                             <field name="days_remaining" readonly="1" widget="badge"/>
                             <field name="approved_by" readonly="1"/>
@@ -101,9 +103,8 @@
                                     style="max-width:250px; max-height:250px; object-fit:contain;"/>
                                 <br/>
                         </group>
-
-                        <notebook>
-                            <page string="Reimburse" attrs="{'invisible': [('type_request', '!=', 'reimburse')]}">
+                        <notebook attrs="{'invisible': [('type_request', '!=', 'reimburse')]}">
+                            <page string="Reimburse">
                                 <h1>Hello World HEHE</h1>
                             </page>
                         </notebook>
-- 
cgit v1.2.3


From 99896ae7999de433837faed09466c06845493770 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Fri, 10 Oct 2025 14:01:49 +0700
Subject: (andri) add reimburse line

---
 .../views/advance_payment_request.xml              | 36 +++++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 134ec9bf..0e8c130b 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -103,12 +103,38 @@
                                     style="max-width:250px; max-height:250px; object-fit:contain;"/>
                                 <br/>
                         </group>
-                        <notebook attrs="{'invisible': [('type_request', '!=', 'reimburse')]}">
-                            <page string="Reimburse">
-                                <h1>Hello World HEHE</h1>
-                            </page>
-                        </notebook>
                     </group>
+                    <notebook attrs="{'invisible': [('type_request', '!=', 'reimburse')]}">
+                        <page string="Reimburse">
+                            <field name="reimburse_line_ids">
+                                <tree>
+                                    <field name="date"/>
+                                    <field name="account_id"/>
+                                    <field name="description"/>
+                                    <!-- <field name="distance"/> -->
+                                    <field name="quantity"/>
+                                    <field name="price"/>
+                                    <field name="total" sum="Total"/>
+                                    <field name="currency_id" invisible="1"/>
+                                </tree>
+                                <form>
+                                    <group>
+                                        <field name="request_id" invisible="1"/>
+                                        <field name="account_id" placeholder="Hanya Finance yang boleh isi"/>
+                                        <field name="date"/>
+                                        <field name="is_vehicle"/>
+                                        <field name="vehicle_type" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
+                                        <field name="description"/>
+                                        <field name="distance" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
+                                        <field name="quantity"/>
+                                        <field name="price"/>
+                                        <field name="total" readonly="1"/>
+                                        <field name="currency_id" invisible="1"/>
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                    </notebook>
                 </sheet>
                 <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
-- 
cgit v1.2.3


From 90a20c802a1675cf781c553de03fa1cb7ba6e2ac Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Fri, 10 Oct 2025 14:47:04 +0700
Subject: (andri)add attachment

---
 .../views/advance_payment_request.xml              | 42 ++++++++++++++--------
 1 file changed, 28 insertions(+), 14 deletions(-)

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 0e8c130b..72948876 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -105,31 +105,45 @@
                         </group>
                     </group>
                     <notebook attrs="{'invisible': [('type_request', '!=', 'reimburse')]}">
-                        <page string="Reimburse">
+                        <page string="Rincian Reimburse">
                             <field name="reimburse_line_ids">
                                 <tree>
-                                    <field name="date"/>
                                     <field name="account_id"/>
+                                    <field name="date"/>
                                     <field name="description"/>
                                     <!-- <field name="distance"/> -->
                                     <field name="quantity"/>
                                     <field name="price"/>
                                     <field name="total" sum="Total"/>
+                                    <field name="is_checked"/>
                                     <field name="currency_id" invisible="1"/>
                                 </tree>
                                 <form>
-                                    <group>
-                                        <field name="request_id" invisible="1"/>
-                                        <field name="account_id" placeholder="Hanya Finance yang boleh isi"/>
-                                        <field name="date"/>
-                                        <field name="is_vehicle"/>
-                                        <field name="vehicle_type" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
-                                        <field name="description"/>
-                                        <field name="distance" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
-                                        <field name="quantity"/>
-                                        <field name="price"/>
-                                        <field name="total" readonly="1"/>
-                                        <field name="currency_id" invisible="1"/>
+                                    <group col="2">
+                                        <group string="Form">
+                                            <field name="request_id" invisible="1"/>
+                                            <field name="date"/>
+                                            <field name="is_vehicle"/>
+                                            <field name="vehicle_type" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
+                                            <field name="description"/>
+                                            <field name="distance" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
+                                            <field name="quantity"/>
+                                            <field name="price"/>
+                                            <field name="total" readonly="1"/>
+                                            <field name="currency_id" invisible="1"/>
+                                            <field name="attachment_type"/>
+                                            <field name="attachment_pdf" filename="attachment_filename"
+                                                widget="pdf_viewer"
+                                                attrs="{'invisible': [('attachment_type', '!=', 'pdf')]}"/>
+                                            <field name="attachment_image" filename="attachment_filename"
+                                                widget="image"
+                                                attrs="{'invisible': [('attachment_type', '!=', 'image')]}"
+                                                style="max-width:250px; max-height:250px; object-fit:contain;"/>
+                                        </group>
+                                        <group string="Finance">
+                                            <field name="is_checked"/>
+                                            <field name="account_id" placeholder="Hanya Finance yang boleh isi"/>
+                                        </group>
                                     </group>
                                 </form>
                             </field>
-- 
cgit v1.2.3


From 698650e73503d0b780694e150fb5cb3f8e91d83d Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 13 Oct 2025 10:53:11 +0700
Subject: (andri) add seq reimburse, penyesuaian approve, & add diwakilkan

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

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 72948876..ba5462b1 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -65,6 +65,7 @@
                     <group col="2">
                         <group string=" ">
                             <field name="type_request" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="is_represented" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="applicant_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="position_type" readonly="1"/>
                             <field name="nominal" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
@@ -80,7 +81,7 @@
                             <field name="apr_perjalanan" attrs="{'invisible': [('type_request', '=', 'reimburse')]}"/>
                             <field name="date_back_to_office" attrs="{'invisible': [('apr_perjalanan', '=', False)]}"/>
                             <p style="font-size: 10px; color: grey; font-style: italic" attrs="{'invisible': [('apr_perjalanan', '=', False)]}">*Setelah tanggal kembali, pemohon diharapkan untuk segera memproses realisasi PUM</p>
-                            <field name="estimated_return_date" readonly="1" widget="badge" attrs="{'invisible': [('apr_perjalanan', '=', False)]}"/>
+                            <field name="estimated_return_date" readonly="1" widget="badge"/>
                             <field name="days_remaining" readonly="1" widget="badge"/>
                             <field name="approved_by" readonly="1"/>
                             <field name="create_date" readonly="1"/>
-- 
cgit v1.2.3


From 99d097d93635eaa1cf92064f1e9070107fe0d8a5 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 13 Oct 2025 11:07:42 +0700
Subject: (andri) checked & jenis biaya hanya bisa AP

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

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index ba5462b1..65138be2 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -142,8 +142,9 @@
                                                 style="max-width:250px; max-height:250px; object-fit:contain;"/>
                                         </group>
                                         <group string="Finance">
-                                            <field name="is_checked"/>
-                                            <field name="account_id" placeholder="Hanya Finance yang boleh isi"/>
+                                            <field name="is_current_user_ap" invisible="1"/>
+                                            <field name="is_checked" attrs="{'readonly': [('is_current_user_ap', '=', False)]}"/>
+                                            <field name="account_id" placeholder="Hanya Finance yang boleh isi" attrs="{'readonly': [('is_current_user_ap', '=', False)]}"/>
                                         </group>
                                     </group>
                                 </form>
-- 
cgit v1.2.3


From 1de6ff22b0c3177d01d989b2c4fab1c64c45c1cf Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 13 Oct 2025 14:31:22 +0700
Subject: (andri) fix

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

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 65138be2..297d2a7a 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -15,11 +15,11 @@
                             string="Reset to Draft"
                             attrs="{'invisible': [('status', '!=', 'reject')]}"
                             type="object"/>                    
-                    <button name="action_reject"
+                    <!-- <button name="action_reject"
                         type="object"
                         string="Reject"
                         class="btn-danger"
-                        attrs="{'invisible': [('status', 'in', ['approved','reject','draft'])]}"/>
+                        attrs="{'invisible': [('status', 'in', ['approved','reject','draft'])]}"/> -->
                     <button name="action_approval_check"
                         type="object"
                         string="Checking/Approval"
@@ -67,7 +67,7 @@
                             <field name="type_request" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="is_represented" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="applicant_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
-                            <field name="position_type" readonly="1"/>
+                            <field name="position_type" force_save="1" readonly="1"/>
                             <field name="nominal" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="bank_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="account_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
@@ -109,9 +109,9 @@
                         <page string="Rincian Reimburse">
                             <field name="reimburse_line_ids">
                                 <tree>
-                                    <field name="account_id"/>
                                     <field name="date"/>
                                     <field name="description"/>
+                                    <field name="account_id"/>
                                     <!-- <field name="distance"/> -->
                                     <field name="quantity"/>
                                     <field name="price"/>
@@ -187,21 +187,21 @@
     </record>
 
     <record id="action_advance_payment_request" model="ir.actions.act_window">
-        <field name="name">Advance Payment Request &amp; Reimburse</field>
+        <field name="name">Advance Payment Request or Reimburse</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">advance.payment.request</field>
         <field name="view_mode">tree,form</field>
     </record>
 
     <menuitem id="menu_advance_payment_request_acct"
-        name="Advance Payment Request &amp; Reimburse"
+        name="Advance Payment Request or Reimburse"
         parent="account.menu_finance_entries"
         sequence="114"
         action="action_advance_payment_request"
     />
     
     <menuitem id="menu_advance_payment_request_sales"
-        name="Advance Payment Request &amp; Reimburse"
+        name="Advance Payment Request or Reimburse"
         parent="sale.product_menu_catalog"
         sequence="101"
         action="action_advance_payment_request"
-- 
cgit v1.2.3


From 545d32974a0d18a4a6560ad222ca5ab7cd0552f6 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 14 Oct 2025 13:23:26 +0700
Subject: (andri) add realisasi di oe button, revisi make CAB, add date upload
 bukti tf

---
 indoteknik_custom/views/advance_payment_request.xml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 297d2a7a..a8eec4f3 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -8,9 +8,9 @@
                 <header>
                     <button name="action_realisasi_pum"
                         type="object"
-                        string="Settlement"
+                        string="Realisasi"
                         class="btn-primary"
-                        attrs="{'invisible': [('status', 'not in', 'approved')]}"/>
+                        attrs="{'invisible': ['|', ('status', '!=', 'approved'), ('has_settlement', '=', True)]}"/>
                     <button name="action_draft"
                             string="Reset to Draft"
                             attrs="{'invisible': [('status', '!=', 'reject')]}"
@@ -43,7 +43,16 @@
                 <sheet>
                     <widget name="web_ribbon" title="Payment" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'payment'), ('status', '=', 'draft')]}"/>
                     <widget name="web_ribbon" title="Pending" bg_color="bg-danger" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'pending'), ('status', '=', 'draft')]}"/>
-                    <div class="oe_button_box" name="button_box">
+                    <div class="oe_button_box" name="button_box" style="right: 150px;">
+                        <field name="has_settlement" invisible="1"/>
+                        <button name="action_realisasi_pum"
+                                type="object"
+                                class="oe_stat_button"
+                                icon="fa-check-square-o"
+                                attrs="{'invisible': [('status', '!=', 'approved')]}">
+                                <!-- <field name="settlement_ids" widget="statinfo" string="Realisasi PUM"/> -->
+                                <field name="settlement_name" class="o_stat_text" nolabel="1"/>
+                        </button>
                         <field name="is_cab_visible" invisible="1"/>
                         <button type="object"
                             name="action_view_journal_uangmuka"
@@ -81,8 +90,8 @@
                             <field name="apr_perjalanan" attrs="{'invisible': [('type_request', '=', 'reimburse')]}"/>
                             <field name="date_back_to_office" attrs="{'invisible': [('apr_perjalanan', '=', False)]}"/>
                             <p style="font-size: 10px; color: grey; font-style: italic" attrs="{'invisible': [('apr_perjalanan', '=', False)]}">*Setelah tanggal kembali, pemohon diharapkan untuk segera memproses realisasi PUM</p>
-                            <field name="estimated_return_date" readonly="1" widget="badge"/>
-                            <field name="days_remaining" readonly="1" widget="badge"/>
+                            <field name="estimated_return_date" readonly="1" widget="badge" attrs="{'invisible': [('type_request', '=', 'reimburse')]}"/>
+                            <field name="days_remaining" readonly="1" widget="badge" attrs="{'invisible': [('type_request', '=', 'reimburse')]}"/>
                             <field name="approved_by" readonly="1"/>
                             <field name="create_date" readonly="1"/>
                             <field name="status_pay_down_payment"
@@ -93,6 +102,7 @@
                             <field name="reason_reject" attrs="{'invisible': [('status', '!=', 'reject')], 'readonly': True}"/>
                         </group>
                         <group string="Bukti Transfer">
+                            <field name="upload_attachment_date" readonly="1"/>
                             <field name="attachment_type" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                                 <field name="attachment_file_pdf" filename="attachment_filename"
                                     widget="pdf_viewer"
-- 
cgit v1.2.3


From 0dd05f30c003ffa2ada402c9e882dfddb7ce4f44 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 14 Oct 2025 14:00:20 +0700
Subject: (andri) view realisasi + fix

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

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index a8eec4f3..74ed296d 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -49,9 +49,10 @@
                                 type="object"
                                 class="oe_stat_button"
                                 icon="fa-check-square-o"
-                                attrs="{'invisible': [('status', '!=', 'approved')]}">
+                                style="width: 280px;"
+                                attrs="{'invisible': ['|', ('status', '!=', 'approved'), ('has_settlement', '=', False)]}">
                                 <!-- <field name="settlement_ids" widget="statinfo" string="Realisasi PUM"/> -->
-                                <field name="settlement_name" class="o_stat_text" nolabel="1"/>
+                                <field name="settlement_name" widget="statinfo" string="Realisasi PUM"/>
                         </button>
                         <field name="is_cab_visible" invisible="1"/>
                         <button type="object"
-- 
cgit v1.2.3


From b0bde0e002f5321f7462f520d545876cdc14fd2e Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 14 Oct 2025 15:22:46 +0700
Subject: (andri) add cab reimburse + fix view realisasi

---
 .../views/advance_payment_request.xml              | 37 ++++++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 74ed296d..6b14e631 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -35,6 +35,11 @@
                         string="Make CAB"
                         class="btn-info"
                         attrs="{'invisible': ['|', ('status', 'not in', ['approved']), ('is_cab_visible', '=', True)]}"/>
+                    <button name="action_open_create_reimburse_cab"
+                        type="object"
+                        string="Buat Jurnal Reimburse"
+                        class="btn-info"
+                        />
                     <field name="status" widget="statusbar"
                         statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,approved"
                         statusbar_colors='{"reject":"red"}'
@@ -198,21 +203,21 @@
     </record>
 
     <record id="action_advance_payment_request" model="ir.actions.act_window">
-        <field name="name">Advance Payment Request or Reimburse</field>
+        <field name="name">Pengajuan Uang Muka &amp; Reimburse</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">advance.payment.request</field>
         <field name="view_mode">tree,form</field>
     </record>
 
     <menuitem id="menu_advance_payment_request_acct"
-        name="Advance Payment Request or Reimburse"
+        name="Pengajuan Uang Muka &amp; Reimburse"
         parent="account.menu_finance_entries"
         sequence="114"
         action="action_advance_payment_request"
     />
     
     <menuitem id="menu_advance_payment_request_sales"
-        name="Advance Payment Request or Reimburse"
+        name="Pengajuan Uang Muka &amp; Reimburse"
         parent="sale.product_menu_catalog"
         sequence="101"
         action="action_advance_payment_request"
@@ -266,4 +271,30 @@
         <field name="target">new</field>
     </record>
 
+    <record id="view_form_create_reimburse_cab_wizard" model="ir.ui.view">
+        <field name="name">create.reimburse.cab.wizard.form</field>
+        <field name="model">create.reimburse.cab.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Buat Jurnal Reimburse">
+                <p>Pilih akun bank yang akan digunakan untuk jurnal kredit.</p>
+                <group>
+                    <field name="total_reimburse"/>
+                    <field name="account_id" options="{'no_create': True, 'no_open': True}"/>
+                    <field name="currency_id" invisible="1"/>
+                </group>
+                <footer>
+                    <button name="action_create_reimburse_cab" type="object" string="Buat Jurnal" class="btn-primary"/>
+                    <button string="Batal" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_create_reimburse_cab_wizard" model="ir.actions.act_window">
+        <field name="name">Buat Jurnal Reimburse</field>
+        <field name="res_model">create.reimburse.cab.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_form_create_reimburse_cab_wizard"/>
+        <field name="target">new</field>
+    </record>
 </odoo>
\ No newline at end of file
-- 
cgit v1.2.3


From d893f19a3a3d4bbfe073a55459ac9f1253736016 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Tue, 14 Oct 2025 19:30:16 +0700
Subject: (andri) hapus yang tidak dibutuhkan

---
 .../views/advance_payment_request.xml              | 32 ----------------------
 1 file changed, 32 deletions(-)

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 6b14e631..ba565ce7 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -11,15 +11,6 @@
                         string="Realisasi"
                         class="btn-primary"
                         attrs="{'invisible': ['|', ('status', '!=', 'approved'), ('has_settlement', '=', True)]}"/>
-                    <button name="action_draft"
-                            string="Reset to Draft"
-                            attrs="{'invisible': [('status', '!=', 'reject')]}"
-                            type="object"/>                    
-                    <!-- <button name="action_reject"
-                        type="object"
-                        string="Reject"
-                        class="btn-danger"
-                        attrs="{'invisible': [('status', 'in', ['approved','reject','draft'])]}"/> -->
                     <button name="action_approval_check"
                         type="object"
                         string="Checking/Approval"
@@ -105,7 +96,6 @@
                                 decoration-success="status_pay_down_payment == 'payment'"
                                 decoration-danger="status_pay_down_payment == 'pending'"
                                 widget="badge" invisible = "1"/>
-                            <field name="reason_reject" attrs="{'invisible': [('status', '!=', 'reject')], 'readonly': True}"/>
                         </group>
                         <group string="Bukti Transfer">
                             <field name="upload_attachment_date" readonly="1"/>
@@ -248,28 +238,6 @@
         <field name="target">new</field>
     </record>
 
-    <record id="view_advance_payment_request_reject_form" model="ir.ui.view">
-        <field name="name">advance.payment.request.reject.form</field>
-        <field name="model">advance.payment.request.reject</field>
-        <field name="arch" type="xml">
-            <form string="Alasan Penolakan APR">
-                <group>
-                    <field name="reason_reject"/>
-                </group>
-                <footer>
-                    <button name="confirm_reject" type="object" string="Tolak" class="btn-danger"/>
-                    <button string="Batal" class="btn-secondary" special="cancel"/>
-                </footer>
-            </form>
-        </field>
-    </record>
-
-    <record id="action_advance_payment_request_reject" model="ir.actions.act_window">
-        <field name="name">Tolak Pengajuan APR</field>
-        <field name="res_model">advance.payment.request.reject</field>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
 
     <record id="view_form_create_reimburse_cab_wizard" model="ir.ui.view">
         <field name="name">create.reimburse.cab.wizard.form</field>
-- 
cgit v1.2.3


From a4363a5468a5a9d6a3815cb8ae304fe1da3aef30 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Sat, 18 Oct 2025 15:26:50 +0700
Subject: (andri) fix field + readonly action view journal

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

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index ba565ce7..073fa815 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -51,11 +51,12 @@
                                 <field name="settlement_name" widget="statinfo" string="Realisasi PUM"/>
                         </button>
                         <field name="is_cab_visible" invisible="1"/>
+                        <field name="is_current_user_ap" invisible="1"/>
                         <button type="object"
                             name="action_view_journal_uangmuka"
                             class="oe_stat_button"
                             icon="fa-book"
-                            attrs="{'invisible': [('is_cab_visible', '=', False)]}"
+                            attrs="{'invisible': [('is_cab_visible', '=', False)], 'readonly': [('is_current_user_ap', '=', False)]}"
                             style="width: 200px;">
                             <field name="move_id" widget="statinfo" string="Journal Uang Muka"/>
                             <span class="o_stat_text">
-- 
cgit v1.2.3


From 06e514d5287d2a316787e80648a06b2d92dc0d47 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 20 Oct 2025 10:26:32 +0700
Subject: (andri) grandtotal reimburse

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

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 073fa815..b7db4e07 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -23,14 +23,14 @@
                         attrs="{'invisible': ['|', ('status', 'not in', ['approved']), ('status_pay_down_payment', '=', 'payment')]}"/>
                     <button name="action_ap_only"
                         type="object"
-                        string="Make CAB"
+                        string="Buat Jurnal PUM"
                         class="btn-info"
                         attrs="{'invisible': ['|', ('status', 'not in', ['approved']), ('is_cab_visible', '=', True)]}"/>
                     <button name="action_open_create_reimburse_cab"
                         type="object"
                         string="Buat Jurnal Reimburse"
                         class="btn-info"
-                        />
+                        attrs="{'invisible': ['|', ('status', 'not in', ['approved']), ('is_cab_visible', '=', True)]}"/>
                     <field name="status" widget="statusbar"
                         statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,approved"
                         statusbar_colors='{"reject":"red"}'
@@ -134,9 +134,10 @@
                                             <field name="is_vehicle"/>
                                             <field name="vehicle_type" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
                                             <field name="description"/>
-                                            <field name="distance" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
+                                            <field name="distance_departure" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
+                                            <field name="distance_return" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
                                             <field name="quantity"/>
-                                            <field name="price"/>
+                                            <field name="price" attrs="{'readonly': [('is_vehicle', '=', True)]}" force_save ="1"/>
                                             <field name="total" readonly="1"/>
                                             <field name="currency_id" invisible="1"/>
                                             <field name="attachment_type"/>
@@ -156,6 +157,12 @@
                                     </group>
                                 </form>
                             </field>
+                            <group class="oe_subtotal_footer oe_right" name="reimburse_total">
+                                <field name="currency_id" invisible="1"/>
+                                <field name="grand_total_reimburse" 
+                                    widget="monetary" 
+                                    options="{'currency_field': 'currency_id'}"/>
+                            </group>
                         </page>
                     </notebook>
                 </sheet>
-- 
cgit v1.2.3


From 4777ebcb87e53b2460661019d70c08aea938dd21 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 20 Oct 2025 11:19:03 +0700
Subject: (andri) fix create

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

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index b7db4e07..39f8f588 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -121,7 +121,7 @@
                                     <field name="account_id"/>
                                     <!-- <field name="distance"/> -->
                                     <field name="quantity"/>
-                                    <field name="price"/>
+                                    <field name="price_unit"/>
                                     <field name="total" sum="Total"/>
                                     <field name="is_checked"/>
                                     <field name="currency_id" invisible="1"/>
@@ -137,7 +137,7 @@
                                             <field name="distance_departure" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
                                             <field name="distance_return" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
                                             <field name="quantity"/>
-                                            <field name="price" attrs="{'readonly': [('is_vehicle', '=', True)]}" force_save ="1"/>
+                                            <field name="price_unit" attrs="{'readonly': [('is_vehicle', '=', True)]}" force_save ="1"/>
                                             <field name="total" readonly="1"/>
                                             <field name="currency_id" invisible="1"/>
                                             <field name="attachment_type"/>
-- 
cgit v1.2.3


From e7264cf6995755f3a55e0d1eb9059354a56c552f Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Fri, 24 Oct 2025 10:11:01 +0700
Subject: (andri) fix

---
 indoteknik_custom/views/advance_payment_request.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 39f8f588..6a0d61b1 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -25,12 +25,22 @@
                         type="object"
                         string="Buat Jurnal PUM"
                         class="btn-info"
-                        attrs="{'invisible': ['|', ('status', 'not in', ['approved']), ('is_cab_visible', '=', True)]}"/>
+                        attrs="{'invisible': ['|', 
+                            ('status', 'not in', ['approved']), 
+                            '|', 
+                            ('is_cab_visible', '=', True), 
+                            ('type_request', '!=', 'pum')
+                        ]}"/>
                     <button name="action_open_create_reimburse_cab"
                         type="object"
                         string="Buat Jurnal Reimburse"
                         class="btn-info"
-                        attrs="{'invisible': ['|', ('status', 'not in', ['approved']), ('is_cab_visible', '=', True)]}"/>
+                        attrs="{'invisible': ['|', 
+                            ('status', 'not in', ['approved']), 
+                            '|', 
+                            ('is_cab_visible', '=', True), 
+                            ('type_request', '!=', 'reimburse')
+                        ]}"/>
                     <field name="status" widget="statusbar"
                         statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,approved"
                         statusbar_colors='{"reject":"red"}'
@@ -72,7 +82,7 @@
                     <group col="2">
                         <group string=" ">
                             <field name="type_request" attrs="{'readonly': [('status', '=', 'approved')]}"/>
-                            <field name="is_represented" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="is_represented" attrs="{'readonly': [('status', '=', 'approved')], 'invisible': [('type_request', '=', 'reimburse')]}"/>
                             <field name="applicant_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="position_type" force_save="1" readonly="1"/>
                             <field name="nominal" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
-- 
cgit v1.2.3


From 73b7658b46f62518274fec1fb1291d5a88a5ed5a Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Mon, 27 Oct 2025 15:41:09 +0700
Subject: (andri) final

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

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

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 6a0d61b1..c33a2843 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -10,7 +10,10 @@
                         type="object"
                         string="Realisasi"
                         class="btn-primary"
-                        attrs="{'invisible': ['|', ('status', '!=', 'approved'), ('has_settlement', '=', True)]}"/>
+                        attrs="{'invisible': ['|',
+                            ('status', '!=', 'approved'), 
+                            '|', ('type_request', '!=', 'pum'),
+                            ('has_settlement', '=', True)]}"/>
                     <button name="action_approval_check"
                         type="object"
                         string="Checking/Approval"
@@ -66,7 +69,7 @@
                             name="action_view_journal_uangmuka"
                             class="oe_stat_button"
                             icon="fa-book"
-                            attrs="{'invisible': [('is_cab_visible', '=', False)], 'readonly': [('is_current_user_ap', '=', 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">
@@ -110,14 +113,14 @@
                         </group>
                         <group string="Bukti Transfer">
                             <field name="upload_attachment_date" readonly="1"/>
-                            <field name="attachment_type" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="attachment_type" attrs="{'readonly': [('is_current_user_ap', '=', False)]}" />
                                 <field name="attachment_file_pdf" filename="attachment_filename"
                                     widget="pdf_viewer"
-                                    attrs="{'invisible': [('attachment_type', '!=', 'pdf')], 'readonly': [('status', '=', 'approved')]}"/>
+                                    attrs="{'invisible': [('attachment_type', '!=', 'pdf')], 'readonly': [('is_current_user_ap', '=', False)]}"/>
 
                                 <field name="attachment_file_image" filename="attachment_filename"
                                     widget="image"
-                                    attrs="{'invisible': [('attachment_type', '!=', 'image')], 'readonly': [('status', '=', 'approved')]}"
+                                    attrs="{'invisible': [('attachment_type', '!=', 'image')], 'readonly': [('is_current_user_ap', '=', False)]}"
                                     style="max-width:250px; max-height:250px; object-fit:contain;"/>
                                 <br/>
                         </group>
@@ -205,7 +208,7 @@
                     decoration-danger="status_pay_down_payment == 'pending'"
                     widget="badge"/>
                 <field name="days_remaining" readonly="1" widget="badge" optional="hide"/>
-                <field name="estimated_return_date" widget="badge" />
+                <field name="estimated_return_date" widget="badge" optional="hide"/>
             </tree>
         </field>
     </record>
@@ -226,7 +229,7 @@
     
     <menuitem id="menu_advance_payment_request_sales"
         name="Pengajuan Uang Muka &amp; Reimburse"
-        parent="sale.product_menu_catalog"
+        parent="indoteknik_custom.menu_monitoring_in_sale"
         sequence="101"
         action="action_advance_payment_request"
     />
-- 
cgit v1.2.3