Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into cr_renca_find

1 files changed, 46 insertions, 7 deletions

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index dd6370c7..340e0caf 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -4,7 +4,7 @@
         <field name="name">advance.payment.request.form</field>
         <field name="model">advance.payment.request</field>
         <field name="arch" type="xml">
-            <form string="Advance Payment Request &amp; Reimburse" duplicate="0">
+            <form string="Advance Payment Request &amp; Reimburse" duplicate="0" delete="false">
                 <header>
                     <button name="action_realisasi_pum"
                         type="object"
@@ -18,7 +18,7 @@
                         type="object"
                         string="Checking/Approval"
                         class="btn-success"
-                         attrs="{'invisible': [('status', 'in', ['approved','reject','draft'])]}"/>
+                         attrs="{'invisible': [('status', 'in', ['approved','cancel','draft'])]}"/>
                     <button name="action_confirm_payment"
                         type="object"
                         string="Konfirmasi Pembayaran"
@@ -44,6 +44,11 @@
                             ('is_cab_visible', '=', True), 
                             ('type_request', '!=', 'reimburse')
                         ]}"/>
+                    <button name="action_open_cancel_wizard" 
+                        string="Cancel" 
+                        type="object" 
+                        class="btn-danger" 
+                        attrs="{'invisible': ['|',('status', 'in', ['draft', 'cancel']), ('status_pay_down_payment', '=', 'payment')]}"/>
                     <field name="status" widget="statusbar"
                         statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,approved"
                         statusbar_colors='{"reject":"red"}'
@@ -51,7 +56,8 @@
                 </header>
                 <sheet>
                     <widget name="web_ribbon" title="Payment" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'payment'), ('status', '=', 'draft')]}"/>
-                    <widget name="web_ribbon" title="Pending" bg_color="bg-danger" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'pending'), ('status', '=', 'draft')]}"/>
+                    <widget name="web_ribbon" title="Pending" bg_color="bg-warning" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'pending'), ('status', '=', 'draft')]}"/>
+                    <widget name="web_ribbon" title="Cancel" bg_color="bg-danger" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'cancel'), ('status', '=', 'draft')]}"/>
                     <div class="oe_button_box" name="button_box" style="right: 150px;">
                         <field name="has_settlement" invisible="1"/>
                         <button name="action_realisasi_pum"
@@ -108,9 +114,10 @@
                             <field name="approved_by" readonly="1"/>
                             <field name="create_date" readonly="1"/>
                             <field name="status_pay_down_payment"
-                                readonly="1"
+                                readonly="1"            
                                 decoration-success="status_pay_down_payment == 'payment'"
-                                decoration-danger="status_pay_down_payment == 'pending'"
+                                decoration-warning="status_pay_down_payment == 'pending'"
+                                decoration-danger="status_pay_down_payment == 'cancel'"
                                 widget="badge" invisible = "1"/>
                         </group>
                         <group string="Bukti Transfer">
@@ -194,7 +201,7 @@
         <field name="name">advance.payment.request.tree</field>
         <field name="model">advance.payment.request</field>
         <field name="arch" type="xml">
-            <tree>
+            <tree delete="false">
                 <field name="number"/>
                 <field name="applicant_name"/>
                 <field name="nominal"/>
@@ -207,7 +214,8 @@
                 <field name="status_pay_down_payment"
                     readonly="1"
                     decoration-success="status_pay_down_payment == 'payment'"
-                    decoration-danger="status_pay_down_payment == 'pending'"
+                    decoration-warning="status_pay_down_payment == 'pending'"
+                    decoration-danger="status_pay_down_payment == 'cancel'"
                     widget="badge"/>
                 <field name="days_remaining" readonly="1" widget="badge" optional="hide"/>
                 <field name="estimated_return_date" widget="badge" optional="hide"/>
@@ -228,6 +236,7 @@
                 <filter string="PUM" name="filter_pum" domain="[('type_request','=','pum')]"/>
                 <filter string="Reimburse" name="filter_reimburse" domain="[('type_request','=','reimburse')]"/>
                 <separator/>
+                <filter string="Cancelled" name="filter_cancelled" domain="[('status','=','cancel')]"/>
                 <filter string="Waiting for Approval" name="filter_waiting_approval" domain="[('status','in',['pengajuan1','pengajuan2','pengajuan3'])]"/>
                 <filter string="Approved" name="filter_approved" domain="[('status','=','approved')]"/>
                 <separator/>
@@ -316,4 +325,34 @@
         <field name="view_id" ref="view_form_create_reimburse_cab_wizard"/>
         <field name="target">new</field>
     </record>
+
+    <record id="view_advance_payment_cancel_wizard_form" model="ir.ui.view">
+            <field name="name">advance.payment.cancel.wizard.form</field>
+            <field name="model">advance.payment.cancel.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Batalkan Pengajuan">
+                    <sheet>
+                        <group>
+                            <div class="alert alert-warning" role="alert" style="margin-bottom: 10px;">
+                                Apakah Anda yakin ingin membatalkan pengajuan ini? 
+                                Silakan isi alasan pembatalan di bawah ini.
+                            </div>
+                        </group>
+                        <group>
+                            <field name="reason"/>
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="action_confirm_cancel" 
+                                string="Konfirmasi Cancel" 
+                                type="object" 
+                                class="btn-danger"/>
+                        
+                        <button string="Tutup" 
+                                class="btn-secondary" 
+                                special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
 </odoo>
\ No newline at end of file