Merge branch 'odoo-production' into dev/wms

# Conflicts:
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/stock_immediate_transfer.py
#	indoteknik_custom/models/stock_picking.py

15 files changed, 218 insertions, 9 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 36b292e8..17263c3a 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -27,6 +27,7 @@
                 </field>
                 <field name="invoice_date" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
+                    <field name="purchase_order_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"/>
                 </field>
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
@@ -137,6 +138,9 @@
                         {'column_invisible': [('parent.move_type', '!=', 'in_invoice')]}
                     </attribute>
                 </field>
+                <field name="product_id" position="before">
+                    <field name="line_no" optional="hide"/>
+                </field>
                 <field name="invoice_incoterm_id" position="after">
                     <field name="date_terima_tukar_faktur"/>
                 </field>
diff --git a/indoteknik_custom/views/barcoding_product.xml b/indoteknik_custom/views/barcoding_product.xml
index 566655ff..c7473d39 100644
--- a/indoteknik_custom/views/barcoding_product.xml
+++ b/indoteknik_custom/views/barcoding_product.xml
@@ -8,6 +8,7 @@
                 <tree default_order="create_date desc">
                     <field name="product_id"/>
                     <field name="quantity"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
@@ -32,11 +33,13 @@
                         <group>
                             <group>
                                 <field name="product_id" required="1"/>
-                                <field name="quantity" required="1"/>
+                                <field name="type" required="1"/>
+                                <field name="quantity" attrs="{'invisible': [['type', 'in', ('barcoding')]], 'required': [['type', 'not in', ('barcoding')]]}"/>
+                                <field name="barcode" attrs="{'invisible': [['type', 'in', ('print')]], 'required': [['type', 'not in', ('print')]]}"/>
                             </group>
                         </group>
                         <notebook>
-                            <page string="Line">
+                            <page string="Line" attrs="{'invisible': [['type', 'in', ('barcoding')]]}">
                                 <field name="barcoding_product_line"/>    
                             </page>
                         </notebook>
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 a70b2058..36c0db13 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -51,6 +51,9 @@
                 <field name="approval_status" position="after">
                     <field name="approval_status_unlock" invisible="True"/>
                 </field>
+                <field name="partner_id" position="after">
+                    <field name="purchase_order_count"/>
+                </field>
                 <field name="incoterm_id" position="after">
                     <field name="amount_total_without_service"/>
                     <field name="delivery_amt"/>
@@ -78,6 +81,9 @@
                 <field name="product_id" position="attributes">
                     <attribute name="options">{'no_create': True}</attribute>
                 </field>
+                <field name="date_planned" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </field>
                 <field name="product_qty" position="before">
                     <field name="is_edit_product_qty" readonly="1" optional="hide"/>
                     <field name="qty_onhand" readonly="1" optional="hide"/>
@@ -103,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"/>
@@ -197,7 +207,7 @@
                     <field name="status_printed" optional="hide"/>
                 </field>
                 <field name="partner_id" position="after">  
-                    <field name="store_name"/>
+                    <field name="store_name" optional="hide"/>
                 </field>
             </field>
         </record>
@@ -290,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"/>
@@ -319,6 +331,15 @@
         </record>
     </data>
     <data>
+        <record id="purchase_order_multi_ask_approval_ir_actions_server" model="ir.actions.server">
+            <field name="name">Ask Approval PO</field>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
+            <field name="binding_model_id" ref="purchase.model_purchase_order"/>
+            <field name="state">code</field>
+            <field name="code">action = records.open_form_multi_ask_approval_po()</field>
+        </record>
+    </data>
+    <data>
         <record id="purchase_order_multi_create_uangmuka_ir_actions_server" model="ir.actions.server">
             <field name="name">Uang Muka</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
diff --git a/indoteknik_custom/views/purchase_order_multi_ask_approval.xml b/indoteknik_custom/views/purchase_order_multi_ask_approval.xml
new file mode 100644
index 00000000..887ac0bd
--- /dev/null
+++ b/indoteknik_custom/views/purchase_order_multi_ask_approval.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="view_purchase_order_multi_ask_approval_po_form" model="ir.ui.view">
+            <field name="name">Purchase Order Multi ask_approval</field>
+            <field name="model">purchase.order.multi_ask_approval</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                           <span>Apakah Anda Yakin Ingin Ask Approval PO Tersebut?</span> 
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="save_multi_ask_approval_po" string="Ask Approval PO" type="object" default_focus="1" class="oe_highlight"/>
+                        <button string="Cancel" class="btn btn-secondary" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_purchase_order_multi_ask_approval" model="ir.actions.act_window">
+            <field name="name">Purchase Order Multi ask_approval</field>
+            <field name="res_model">purchase.order.multi_ask_approval</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_purchase_order_multi_ask_approval_po_form"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/report_logbook_sj.xml b/indoteknik_custom/views/report_logbook_sj.xml
index 896594bb..94f6c2ab 100644
--- a/indoteknik_custom/views/report_logbook_sj.xml
+++ b/indoteknik_custom/views/report_logbook_sj.xml
@@ -77,6 +77,16 @@
         </field>
     </record>
 
+    <record id="report_logbook_sj_view_search" model="ir.ui.view">
+            <field name="name">report.logbook.sj.search.view</field> <!-- Made the name more descriptive -->
+            <field name="model">report.logbook.sj</field>
+            <field name="arch" type="xml">
+                <search string="Search Report">
+                    <field name="sj_number"/>
+                </search>
+            </field>
+        </record>  
+
     <record id="report_logbook_sj_action" model="ir.actions.act_window">
         <field name="name">Report Logbook SJ</field>
         <field name="type">ir.actions.act_window</field>
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index bd664890..af5e0db3 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -68,6 +68,7 @@
                 <field name="vat" position="after">
                     <field name="email_finance" widget="email"/>
                     <field name="email_sales" widget="email"/>
+                    <field name="telegram_id"/>
                     <field name="use_so_approval" attrs="{'invisible': [('parent_id', '!=', False), ('company_type', '!=', 'company')]}" />
                     <field name="use_only_ready_stock" attrs="{'invisible': [('parent_id', '!=', False), ('company_type', '!=', 'company')]}" />
                     <field name="web_role" attrs="{'invisible': ['|', ('parent_id', '=', False), ('company_type', '=', 'company')]}" />
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 4d31b072..8158774b 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -111,7 +111,7 @@
                     <field name="desc_updatable" invisible="1"/>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='name']" position="attributes">
-                    <attribute name="attrs">
+                    <attribute name="modifiers">
                         {'readonly': [('desc_updatable', '=', False)]}
                     </attribute>
                 </xpath>
@@ -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">
@@ -299,6 +324,7 @@
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
                     <field name="pareto_status" optional="hide"/>
+                    <field name="shipping_method_picking" optional="hide"/>
                 </field>
             </field>
         </record>
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/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 016fbf17..03fc8f87 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -89,9 +89,9 @@
                 <field name="partner_id" position="after">
                     <field name="real_shipping_id"/>
                 </field>
-                <field name="product_uom_qty" position="attributes">
+                <!-- <field name="product_uom_qty" position="attributes">
                     <attribute name="attrs">{'readonly': [('parent.picking_type_code', '=', 'incoming')]}</attribute>
-                </field>
+                </field> -->
                 <field name="date_done" position="after">
                     <field name="arrival_time"/>
                 </field>
diff --git a/indoteknik_custom/views/user_pengajuan_tempo.xml b/indoteknik_custom/views/user_pengajuan_tempo.xml
index 33ad91cf..7f1faa41 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo.xml
@@ -269,7 +269,7 @@
             <field name="subject">Pengajuan Tempo Harus di Periksa!</field>
             <field name="email_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
             <field name="reply_to">sales@indoteknik.com</field>
-            <field name="email_to">widyariyanti97@gmail.com, stephan@indoteknik.co.id</field>
+            <field name="email_to">finance@indoteknik.co.id, stephan@indoteknik.co.id, sapiabon768@gmail.com</field>
 <!--            <field name="email_to">sapiabon768@gmail.com</field>-->
             <field name="body_html" type="html">
                 <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;">
diff --git a/indoteknik_custom/views/user_pengajuan_tempo_request.xml b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
index bb8262c9..7063231b 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo_request.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
@@ -10,7 +10,17 @@
                 <field name="create_date"/>
                 <field name="tempo_duration" attrs="{'readonly': [('state_tempo', '=', 'approval_director')]}"/>
                 <field name="tempo_limit" attrs="{'readonly': [('state_tempo', '=', 'approval_director')]}" placeholder="Contoh format, misalnya '10000000'" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                <field name="state_tempo" decoration-success="state_tempo == 'approval_director'" decoration-danger="state_tempo == 'reject'" widget="badge" optional="show"/>
+<!--                <field name="state_tempo"-->
+<!--                    decoration-danger="state_tempo == 'reject'"-->
+<!--                    decoration-warning="state_tempo in ('draft', 'approval_sales', 'approval_finance')"-->
+<!--                    decoration-success="state_tempo == 'approval_director'">-->
+<!--                    <tree>-->
+<!--                        <field name="state_tempo" invisible="1"/>-->
+<!--                        <field name="state_tempo_text" string="Status"/>-->
+<!--                    </tree>-->
+<!--                </field>-->
+                 <field name="state_tempo" invisible="1"/>
+                <field name="state_tempo_text" decoration-success="state_tempo_text == 'Approved'" decoration-danger="state_tempo_text == 'Rejected'" widget="badge" optional="show"/>
             </tree>
         </field>
     </record>
@@ -30,7 +40,11 @@
                         string="Reject"
                         attrs="{'invisible': [('state_tempo', 'in', ['approval_director','reject'])]}"
                         type="object"
-                        groups="purchase.group_purchase_manager"
+                        class="oe_highlight"/>
+                <button name="button_draft"
+                        string="Reset to Draft"
+                        attrs="{'invisible': [('state_tempo', '!=', 'reject')]}"
+                        type="object"
                         class="oe_highlight"/>
                 <field name="state_tempo" widget="statusbar"
                        statusbar_visible="draft,approval_sales,approval_finance,approval_director"
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>
diff --git a/indoteknik_custom/views/website_telegram.xml b/indoteknik_custom/views/website_telegram.xml
new file mode 100644
index 00000000..d8590fc0
--- /dev/null
+++ b/indoteknik_custom/views/website_telegram.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="website_telegram_action" model="ir.actions.act_window">
+            <field name="name">Channel Telegram</field>
+            <field name="res_model">website.telegram</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <record id="website_telegram_tree" model="ir.ui.view">
+            <field name="name">website.telegram.tree</field>
+            <field name="model">website.telegram</field>
+            <field name="arch" type="xml">
+                <tree string="Channel List">
+                        <field name="tittle"/>
+                        <field name="about"/>
+                        <field name="user_id"/>
+                    <button name="test_send" type="object" icon="fa-paper-plane" string="Send Test"/>
+<!--                    <button name="create_channel" type="object" icon="fa-paper-plane" string="Create Channel"/>-->
+<!--                    <button name="receive_messages" type="object" icon="fa-paper-plane" string="GET Test"/>-->
+                </tree>
+            </field>
+        </record>
+
+        <record id="website_telegram_form" model="ir.ui.view">
+            <field name="name">website.telegram.form</field>
+            <field name="model">website.telegram</field>
+            <field name="arch" type="xml">
+                <form create="0">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="tittle"/>
+                                <field name="about"/>
+                                <field name="user_id" widget="many2many_tags"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="ir_actions_server_website_telegram_sync_to_solr" model="ir.actions.server">
+            <field name="name">Sync to solr</field>
+            <field name="model_id" ref="indoteknik_custom.model_website_telegram"/>
+            <field name="binding_model_id" ref="indoteknik_custom.model_website_telegram"/>
+            <field name="state">code</field>
+            <field name="code">model.action_sync_to_solr()</field>
+        </record>
+
+        <menuitem
+            id="website_telegram"
+            name="Channel Telegram"
+            parent="website_sale.menu_orders"
+            sequence="1"
+            action="website_telegram_action"
+        />
+    </data>
+</odoo>