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

4 files changed, 54 insertions, 6 deletions

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index dd6370c7..b1d20406 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -4,7 +4,7 @@
         <field name="name">advance.payment.request.form</field>
         <field name="model">advance.payment.request</field>
         <field name="arch" type="xml">
-            <form string="Advance Payment Request &amp; Reimburse" duplicate="0">
+            <form string="Advance Payment Request &amp; Reimburse" duplicate="0" delete="false">
                 <header>
                     <button name="action_realisasi_pum"
                         type="object"
@@ -44,6 +44,11 @@
                             ('is_cab_visible', '=', True), 
                             ('type_request', '!=', 'reimburse')
                         ]}"/>
+                    <button name="action_open_cancel_wizard" 
+                        string="Cancel" 
+                        type="object" 
+                        class="btn-danger" 
+                        attrs="{'invisible': [('status', 'in', ['draft', 'cancel'])]}"/>
                     <field name="status" widget="statusbar"
                         statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,approved"
                         statusbar_colors='{"reject":"red"}'
@@ -194,7 +199,7 @@
         <field name="name">advance.payment.request.tree</field>
         <field name="model">advance.payment.request</field>
         <field name="arch" type="xml">
-            <tree>
+            <tree delete="false">
                 <field name="number"/>
                 <field name="applicant_name"/>
                 <field name="nominal"/>
@@ -316,4 +321,34 @@
         <field name="view_id" ref="view_form_create_reimburse_cab_wizard"/>
         <field name="target">new</field>
     </record>
+
+    <record id="view_advance_payment_cancel_wizard_form" model="ir.ui.view">
+            <field name="name">advance.payment.cancel.wizard.form</field>
+            <field name="model">advance.payment.cancel.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Batalkan Pengajuan">
+                    <sheet>
+                        <group>
+                            <div class="alert alert-warning" role="alert" style="margin-bottom: 10px;">
+                                Apakah Anda yakin ingin membatalkan pengajuan ini? 
+                                Silakan isi alasan pembatalan di bawah ini.
+                            </div>
+                        </group>
+                        <group>
+                            <field name="reason"/>
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="action_confirm_cancel" 
+                                string="Konfirmasi Cancel" 
+                                type="object" 
+                                class="btn-danger"/>
+                        
+                        <button string="Tutup" 
+                                class="btn-secondary" 
+                                special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/advance_payment_settlement.xml b/indoteknik_custom/views/advance_payment_settlement.xml
index a77baffe..a8bf1de7 100644
--- a/indoteknik_custom/views/advance_payment_settlement.xml
+++ b/indoteknik_custom/views/advance_payment_settlement.xml
@@ -3,7 +3,7 @@
         <field name="name">advance.payment.settlement.form</field>
         <field name="model">advance.payment.settlement</field>
         <field name="arch" type="xml">
-            <form string="Advance Payment Settlement" duplicate="0">
+            <form string="Advance Payment Settlement" duplicate="0" delete="false">
                 <header>
                     <button name="action_cab"
                         type="object"
@@ -163,10 +163,13 @@
         <field name="arch" type="xml">
             <tree create="false" delete="false">
                 <field name="name"/>
-                <field name="pum_id"/>
-                <field name="grand_total_use" string="Total Realisasi"/>
+                <field name="applicant_name"/>
+                <!-- <field name="pum_id"/> -->
+                <field name="nominal_pum" string="Total Pengajuan"/>
+                <field name="grand_total_use" string="Total Penggunaan"/>
                 <field name="remaining_value" string="Sisa PUM"/>
                 <field name="status" widget="badge" decoration-success="status == 'approved'"/>
+                <field name="is_cab_visible" widget="boolean"/>
                 </tree>
         </field>
     </record>
diff --git a/indoteknik_custom/views/commission_internal.xml b/indoteknik_custom/views/commission_internal.xml
index 2f3db5b0..d84eb4b8 100644
--- a/indoteknik_custom/views/commission_internal.xml
+++ b/indoteknik_custom/views/commission_internal.xml
@@ -108,6 +108,7 @@
                 <field name="res_name" optional="hide"/>
                 <field name="res_id" optional="hide"/>
                 <field name="name"/>
+                <field name="customer"/>
                 <field name="salesperson"/>
                 <field name="totalamt"/>
                 <field name="uang_masuk_line_id" optional="hide"/>
diff --git a/indoteknik_custom/views/purchasing_job.xml b/indoteknik_custom/views/purchasing_job.xml
index 2466e7be..6b8baa53 100644
--- a/indoteknik_custom/views/purchasing_job.xml
+++ b/indoteknik_custom/views/purchasing_job.xml
@@ -98,6 +98,15 @@
         <field name="code">action = records.open_form_multi_generate_request_po()</field>
     </record>
 
+    <record id="purchasing_job_action_seen_ir_actions_server" model="ir.actions.server">
+        <field name="name">Seen Selected Job</field>
+        <field name="model_id" ref="model_v_purchasing_job"/>
+        <field name="binding_model_id" ref="model_v_purchasing_job"/>
+        <field name="binding_view_types">form,list</field>
+        <field name="state">code</field>
+        <field name="code">action = records._set_as_seen()</field>
+    </record>
+
     <menuitem
             id="menu_purchasing_job"
             name="Purchasing Job"
@@ -106,4 +115,4 @@
             action="v_purchasing_job_action"
     />
 
-</odoo>
\ No newline at end of file
+</odoo>