(andri) final

3 files changed, 22 insertions, 19 deletions

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"
     />
diff --git a/indoteknik_custom/views/advance_payment_settlement.xml b/indoteknik_custom/views/advance_payment_settlement.xml
index 72af17d8..1a9d7908 100644
--- a/indoteknik_custom/views/advance_payment_settlement.xml
+++ b/indoteknik_custom/views/advance_payment_settlement.xml
@@ -9,7 +9,7 @@
                         type="object"
                         class="btn-info"
                         attrs="{'invisible': [ '|', ('is_cab_visible', '=', True),('status', '!=', 'approved')]}"
-                        string="Make CAB"/>
+                        string="Buat Jurnal Realisasi"/>
                     <button name="action_approval_check"
                         type="object"
                         string="Checking/Approval"
@@ -177,7 +177,7 @@
     
     <menuitem id="menu_advance_payment_settlement_sales"
         name="Realisasi PUM"
-        parent="sale.product_menu_catalog"
+        parent="indoteknik_custom.menu_monitoring_in_sale"
         sequence="101"
         action="action_advance_payment_settlement"
     />
diff --git a/indoteknik_custom/views/mail_template_pum.xml b/indoteknik_custom/views/mail_template_pum.xml
index fba71e14..81f8ada8 100644
--- a/indoteknik_custom/views/mail_template_pum.xml
+++ b/indoteknik_custom/views/mail_template_pum.xml
@@ -3,9 +3,9 @@
   <data noupdate="0">
 
     <record id="mail_template_pum_reminder_today" model="mail.template">
-      <field name="name">Reminder Settlement APR: Hari Ini</field>
+      <field name="name">Reminder PUM: Hari Ini</field>
       <field name="model_id" ref="indoteknik_custom.model_advance_payment_request"/>
-      <field name="subject">Reminder Settlement APR - ${object.number}</field>
+      <field name="subject">Reminder Realisasi PUM - ${object.number}</field>
       <field name="email_from">${object.email_ap}</field>
       <field name="email_to">andrifebriyadiputra@gmail.com</field>
       <field name="body_html" type="html">
@@ -13,10 +13,10 @@
           <p><b>Dengan Hormat Bpk/Ibu ${object.user_id.display_name},</b></p>
 
           <p>
-            Berikut terlampir pengajuan APR <b>${object.number}</b> sebesar 
+            Berikut terlampir pengajuan PUM <b>${object.number}</b> sebesar 
             <b>${format_amount(object.nominal, object.currency_id)}</b> dari PT. INDOTEKNIK DOTCOM GEMILANG
             pada tanggal ${format_date(object.create_date, 'd MMMM yyyy')}.<br/>
-            Tolong segera selesaikan settlement (realisasi) APR tersebut dengan menyertakan dokumen asli untuk mendukung settlement tersebut 
+            Tolong segera selesaikan realisasi PUM tersebut dengan menyertakan dokumen asli untuk mendukung realisasi tersebut 
             <b>maksimal 7 hari dari sekarang</b>.<br/>
             Terima Kasih
           </p>
@@ -31,16 +31,16 @@
             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/>
           </b></p>
-          <p><i>Email ini dikirim otomatis, abaikan bila sudah melakukan settlement/realisasi.</i></p>
+          <p><i>Email ini dikirim otomatis, abaikan bila sudah melakukan realisasi.</i></p>
         </div>
       </field>
       <field name="auto_delete" eval="True"/>
     </record>
 
     <record id="mail_template_pum_reminder_h_2" model="mail.template">
-      <field name="name">Reminder Settlement APR: H-2</field>
+      <field name="name">Reminder Realisasi PUM: H-2</field>
       <field name="model_id" ref="indoteknik_custom.model_advance_payment_request"/>
-      <field name="subject">Reminder Settlement APR (H-2) - ${object.number}</field>
+      <field name="subject">Reminder Realisasi PUM (H-2) - ${object.number}</field>
       <field name="email_from">${object.email_ap}</field>
       <field name="email_to">andrifebriyadiputra@gmail.com</field>
       <field name="body_html" type="html">
@@ -48,10 +48,10 @@
           <p><b>Dengan Hormat Bpk/Ibu ${object.user_id.display_name},</b></p>
 
           <p>
-            Berikut terlampir pengajuan APR <b>${object.number}</b> sebesar 
+            Berikut terlampir pengajuan PUM <b>${object.number}</b> sebesar 
             <b>${format_amount(object.nominal, object.currency_id)}</b> dari PT. INDOTEKNIK DOTCOM GEMILANG
             pada tanggal ${format_date(object.create_date, 'd MMMM yyyy')}.<br/>
-            Tolong segera selesaikan settlement (realisasi) APR tersebut dengan menyertakan dokumen asli untuk mendukung settlement tersebut 
+            Tolong segera selesaikan realisasi PUM tersebut dengan menyertakan dokumen asli untuk mendukung PUM tersebut 
             <b>batas waktu tersisa 2 hari lagi</b>.<br/>
             Terima Kasih
           </p>
@@ -66,7 +66,7 @@
             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/>
           </b></p>
-          <p><i>Email ini dikirim otomatis, abaikan bila sudah melakukan settlement/realisasi.</i></p>
+          <p><i>Email ini dikirim otomatis, abaikan bila sudah melakukan realisasi.</i></p>
         </div>
       </field>
       <field name="auto_delete" eval="True"/>