Merge branch 'odoo-production' into feature/integrasi_biteship

# Conflicts:
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/sale_order.py
#	indoteknik_custom/security/ir.model.access.csv

6 files changed, 71 insertions, 0 deletions

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 0b72587e..51172b1c 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -12,6 +12,10 @@
                 <field name="commision_percent"/>
                 <field name="commision_amt" readonly="1"/>
                 <field name="status" readonly="1"/>
+                <field name="payment_status" readonly="1"
+                    decoration-success="payment_status == 'payment'"
+                    decoration-danger="payment_status == 'pending'"
+                    widget="badge"/>
                 <field name="brand_ids" widget="many2many_tags"/>
             </tree>
         </field>
@@ -43,6 +47,10 @@
                     <button name="action_confirm_customer_commision" 
                     string="Confirm" type="object"
                     options="{}"/>
+                    <button name="action_confirm_customer_payment"
+                        string="Konfirmasi Pembayaran" type="object"
+                        options="{}"
+                        attrs="{'invisible': [('payment_status', '==', 'payment')], 'readonly': [('payment_status', '=', 'payment')]}"/>
                 </header>
                 <sheet string="Customer Commision">
                         <div class="oe_button_box" name="button_box"/>
@@ -68,6 +76,7 @@
                                 <field name="brand_ids" widget="many2many_tags"/>
                                 <field name="notification" readonly="1"/>
                                 <field name="status" readonly="1"/>
+                                <field name="payment_status" readonly="1" />
                                 <field name="total_dpp"/>
                             </group>
                         </group>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 3e4dd89c..a57bd467 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -109,6 +109,10 @@
                     <field name="price_vendor" attrs="{'readonly': 1}" optional="hide"/>
                 </field>
                 <field name="price_subtotal" position="after">
+                    <field name="so_item_margin" attrs="{'readonly': 1}" optional="hide"/>
+                    <field name="so_item_percent_margin" attrs="{'readonly': 1}" optional="hide"/>
+                    <field name="item_margin" attrs="{'readonly': 1}" optional="hide"/>
+                    <field name="item_percent_margin" attrs="{'readonly': 1}" optional="hide"/>
                     <field name="so_line_id" attrs="{'readonly': 1}" optional="hide"/>
                     <field name="so_id" attrs="{'readonly': 1}" optional="hide"/>
                     <field name="indent" optional="hide"/>
@@ -296,6 +300,8 @@
                     <field name="partner_invoice_id"/>
                     <field name="salesperson_id"/>
                     <field name="product_id"/>
+                    <field name="purchase_price_so"/>
+                    <field name="purchase_price_po"/>
                     <field name="qty_so"/>
                     <field name="qty_po"/>
                     <field name="margin_item" optional="hide"/>
diff --git a/indoteknik_custom/views/res_users.xml b/indoteknik_custom/views/res_users.xml
index 9553bb91..5b35f9c4 100644
--- a/indoteknik_custom/views/res_users.xml
+++ b/indoteknik_custom/views/res_users.xml
@@ -236,6 +236,7 @@
                                             <tr><td style="padding-bottom: 16px;"><b>Pembayaran Lengkap:</b> Pilih metode pembayaran yang sesuai dengan kebutuhan Anda, baik transfer bank, VA, kartu kredit, atau pembayaran tempo.</td></tr>
                                             <tr><td style="padding-bottom: 16px;"><b>Pelacakan Pengiriman:</b> Lacak status pengiriman pesanan Anda secara real-time.</td></tr>
                                             <tr><td style="padding-bottom: 16px;">Untuk memulai transaksi, silakan login Kembali menggunakan akun Anda di <a href="https://indoteknik.com/login">Indoteknik.com</a></td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Gunakan kode voucher berikut untuk mendapatkan diskon belanja hingga 10 juta: <strong>${object.get_voucher_code('switch_account')}</strong></td></tr>
                                             <tr><td style="padding-bottom: 16px;">Kami sangat senang dapat melayani Anda. Jika ada pertanyaan atau membutuhkan bantuan, jangan ragu untuk menghubungi tim layanan Customer kami di Whatsapp <a href="https://wa.me/6281717181922">0817-1718-1922</a> atau  <a href="mailto:sales@indoteknik.com">sales@indoteknik.com</a></td></tr>
 
                                             <tr><td style="padding-bottom: 2px;"><b>Hormat kami,</b></td></tr>
@@ -299,6 +300,7 @@
 
                                             <tr><td style="padding-bottom: 16px;">Selamat! Akun bisnis Anda di indoteknik.com sekarang sudah resmi menjadi PKP dari yang sebelumnya Non-PKP.</td></tr>
                                             <tr><td style="padding-bottom: 16px;">Jangan lupa untuk mengecek kembali semua data perusahaan kamu, ya. Pastikan NPWP dan informasi Perusahaan lainnya sudah kamu isi dengan benar.</td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Gunakan kode voucher berikut untuk mendapatkan diskon belanja hingga 10 juta: <strong>${object.get_voucher_code('switch_account')}</strong></td></tr>
                                             <tr><td style="padding-bottom: 16px;">Kamu juga dapat mengubah informasi perusahaan dengan mengunjungi profil atau <a href="https://indoteknik.com/my/profile">klik disini</a></td></tr>
 
                                             <tr><td style="padding-bottom: 2px;">Industrial Supply &amp; Solutions</td></tr>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 4cc96cd2..ebee64b1 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -286,6 +286,31 @@
                 </page>
             </field>
         </record>
+          <!-- Wizard for Reject Reason -->
+            <record id="view_cancel_reason_order_form" model="ir.ui.view">
+                <field name="name">cancel.reason.order.form</field>
+                <field name="model">cancel.reason.order</field>
+                <field name="arch" type="xml">
+                    <form string="Cancel Reason">
+                        <group>
+                            <field name="reason_cancel" widget="selection"/>
+                            <field name="attachment_bukti" widget="many2many_binary" required="1"/>
+                            <field name="nomor_so_pengganti" attrs="{'invisible': [('reason_cancel', '!=', 'ganti_quotation')]}"/>
+                        </group>
+                        <footer>
+                            <button string="Confirm" type="object" name="confirm_reject" class="btn-primary"/>
+                            <button string="Cancel" class="btn-secondary" special="cancel"/>
+                        </footer>
+                    </form>
+                </field>
+            </record>
+
+            <record id="action_cancel_reason_order" model="ir.actions.act_window">
+                <field name="name">Cancel Reason</field>
+                <field name="res_model">cancel.reason.order</field>
+                <field name="view_mode">form</field>
+                <field name="target">new</field>
+            </record>
     </data>
     <data>
         <record id="sale_order_tree_view_inherit" model="ir.ui.view">
diff --git a/indoteknik_custom/views/stock_inventory.xml b/indoteknik_custom/views/stock_inventory.xml
new file mode 100644
index 00000000..db85f05c
--- /dev/null
+++ b/indoteknik_custom/views/stock_inventory.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <!-- Form View: Tambahkan field 'number' setelah lokasi -->
+    <record id="view_stock_inventory_form_inherit" model="ir.ui.view">
+        <field name="name">stock.inventory.form.inherit</field>
+        <field name="model">stock.inventory</field>
+        <field name="inherit_id" ref="stock.view_inventory_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='location_ids']" position="after">
+                <field name="number" readonly="1"/>
+                <field name="adjusment_type" />
+            </xpath>
+        </field>
+    </record>
+
+    <!-- Tree View: Tambahkan field 'number' setelah tanggal -->
+    <record id="view_stock_inventory_tree_inherit" model="ir.ui.view">
+        <field name="name">stock.inventory.tree.inherit</field>
+        <field name="model">stock.inventory</field>
+        <field name="inherit_id" ref="stock.view_inventory_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='date']" position="after">
+                <field name="number"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml
index 29d0ad4b..ae958f05 100755
--- a/indoteknik_custom/views/voucher.xml
+++ b/indoteknik_custom/views/voucher.xml
@@ -35,6 +35,7 @@
                                 <field name="limit" required="1"/>
                                 <field name="limit_user" required="1"/>
                                 <field name="apply_type" required="1" />
+                                <field name="account_type" required="1" />
                                 <field name="show_on_email" />
                                 <field name="excl_pricelist_ids" widget="many2many_tags" domain="[('id', 'in', [4, 15037, 15038, 15039, 17023, 17024, 17025, 17026,17027])]"/>
                             </group>