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

merge

11 files changed, 64 insertions, 11 deletions

diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index dd6370c7..7f422aa9 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"/>
@@ -316,4 +324,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 c2b6a26f..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"
diff --git a/indoteknik_custom/views/price_group.xml b/indoteknik_custom/views/price_group.xml
index 5db8756e..7fad8d8d 100644
--- a/indoteknik_custom/views/price_group.xml
+++ b/indoteknik_custom/views/price_group.xml
@@ -26,6 +26,8 @@
                     <field name="group6"/>
                     <field name="group7"/>
                     <field name="group8"/>
+                    <field name="group9"/>
+                    <field name="group10"/>
                 </tree>
             </field>
         </record>
@@ -48,6 +50,8 @@
                                 <field name="group6"/>
                                 <field name="group7"/>
                                 <field name="group8"/>
+                                <field name="group9"/>
+                                <field name="group10"/>
                             </group>
                         </group>
                     </sheet>
diff --git a/indoteknik_custom/views/product_product.xml b/indoteknik_custom/views/product_product.xml
index 1d04e708..ee03779f 100644
--- a/indoteknik_custom/views/product_product.xml
+++ b/indoteknik_custom/views/product_product.xml
@@ -20,6 +20,7 @@
                     <field name="qty_free_bandengan" optional="hide"/>
                     <field name="qty_rpo" optional="hide"/>
                     <field name="plafon_qty" optional="hide"/>
+                    <!-- <field name="has_magento" optional="hide"/> -->
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/product_public_category.xml b/indoteknik_custom/views/product_public_category.xml
index a45e0a2e..c2ee154d 100755
--- a/indoteknik_custom/views/product_public_category.xml
+++ b/indoteknik_custom/views/product_public_category.xml
@@ -22,6 +22,7 @@
                 <field name="image" widget="image"/>
                 <field name="sequence_frontend"/>
                 <field name="parent_frontend_id"/>
+                <field name="short_desc"/>
             </xpath>
             <xpath expr="//form[1]/sheet[1]/div[1]/group[1]" position="after">
                 <notebook>
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 1933a5d1..9fbf007a 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -78,6 +78,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="last_update_solr" position="after">
+                    <field name="has_magento"/>
                     <field name="barcode_box" />
                     <field name="qty_pcs_box" />
                     <field name="clean_website_description" />
@@ -114,6 +115,7 @@
                     <field name="solr_flag"/>
                     <field name="x_attribute_set_id"/>
                     <field name="x_attribute_set_name"/>
+                    <!-- <field name="has_magento"/> -->
                 </field>
             </field>
         </record>
@@ -127,6 +129,7 @@
                     <field name="usage"/>
                     <field name="specification"/>
                     <field name="material"/>
+                    <field name="has_magento" />
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 16b8bd44..59e317d2 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -105,6 +105,7 @@
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
                     <field name="total_so_margin"/>
+                    <field name="amount_cashback"/>
                     <field name="total_percent_margin"/>
                     <field name="total_so_percent_margin"/>
                 </field>
diff --git a/indoteknik_custom/views/purchasing_job.xml b/indoteknik_custom/views/purchasing_job.xml
index 6b8baa53..8e1eb3b6 100644
--- a/indoteknik_custom/views/purchasing_job.xml
+++ b/indoteknik_custom/views/purchasing_job.xml
@@ -16,7 +16,8 @@
                 <field name="outgoing"/>
                 <field name="status_apo" invisible="1"/>
                 <field name="action"/>
-                <field name="note"/>
+                <field name="note" optional="hide"/>
+                <field name="note_detail"/>
                 <field name="date_po" optional="hide"/>
                 <field name="so_number"/>
                 <field name="check_pj" invisible="1"/>
@@ -58,7 +59,8 @@
                             <field name="outgoing"/>
                             <field name="purchase_representative_id"/>
                             <field name="vendor_id"/>
-                            <field name="note"/>
+                            <!-- <field name="note"/> -->
+                            <field name="note_detail"/>
                         </group>
                     </group>
                 </sheet>
diff --git a/indoteknik_custom/views/purchasing_job_state.xml b/indoteknik_custom/views/purchasing_job_state.xml
index c7c40020..ca08e44c 100644
--- a/indoteknik_custom/views/purchasing_job_state.xml
+++ b/indoteknik_custom/views/purchasing_job_state.xml
@@ -8,7 +8,8 @@
                 <sheet>
                     <group>
                         <field name="status_apo" readonly="1"/>
-                        <field name="note"/>
+                        <field name="note" invisible="1"/>
+                        <field name="note_detail"/>
                     </group>
                 </sheet>
             </form>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 23fbe155..c3df92ec 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -302,6 +302,7 @@
                             ]
                         }
                     "/>
+                    <field name="amount_cashback"/>
                     <field name="purchase_price_md" optional="hide"/>
                     <field name="purchase_tax_id"
                            attrs="{'readonly': [('parent.approval_status', '!=', False)]}"
diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index 02061251..b52fe795 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -82,6 +82,7 @@
                                 <field name="x_negara_asal"/>
                                 <field name="x_short_desc"/>
                                 <field name="x_manufacture_level"/>
+                                <field name="cashback_percent" widget="percentage"/>
                                 <field name="x_produk_aksesoris_sparepart"/>
                                 <field name="cache_reset_status"/>
                                 <field name="parent_id"/>