Merge branch 'odoo-production' into feature/integrasi_biteship

# Conflicts:
#	indoteknik_custom/security/ir.model.access.csv

7 files changed, 211 insertions, 11 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 4cc35b6d..36b292e8 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -59,6 +59,9 @@
                     <field name="so_delivery_amt"/>
                     <field name="flag_delivery_amt"/>
                 </field>
+                <field name="amount_untaxed" position="after">
+                    <field name="other_subtotal" invisible="1"/>
+                </field>
                 <notebook position="inside">
                     <page string="Due Extension" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}">
                         <field name="due_line">
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index d22c3b5c..022937f4 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -20,6 +20,11 @@
                             type="object"
                             attrs="{'invisible': [('approval_status', '=', 'approved')]}"
                     />
+                    <button name="po_approve_unlock"
+                            string="Ask Approval Unlock PO"
+                            type="object"
+                            attrs="{'invisible': [('approval_status_unlock', '=', 'approved')]}"
+                    />
                     <button name="indoteknik_custom.action_view_uangmuka_pembelian" string="UangMuka"
                         type="action" attrs="{'invisible': [('approval_status', '!=', 'approved')]}"/>
                 </button>
@@ -43,6 +48,9 @@
                     <field name="revisi_po"/>
                     <field name="not_update_purchasepricelist"/>
                 </field>
+                <field name="approval_status" position="after">
+                    <field name="approval_status_unlock" invisible="True"/>
+                </field>
                 <field name="incoterm_id" position="after">
                     <field name="amount_total_without_service"/>
                     <field name="delivery_amt"/>
@@ -52,6 +60,8 @@
                     <field name="summary_qty_po"/>
                     <field name="count_line_product"/>
                     <field name="payment_term_id"/>
+                    <field name="total_cost_service" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
+                    <field name="total_delivery_amt" attrs="{'required': [('partner_id', 'in', [9688, 29712])]}"/>
                 </field>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
@@ -59,6 +69,9 @@
                     <field name="total_percent_margin"/>
                     <field name="total_so_percent_margin"/>
                 </field>
+                <field name="partner_ref" position="before">
+                    <field name="store_name" attrs="{'invisible': [('partner_id', 'not in', [9688, 29712])]}"/>
+                </field>
                 <field name="product_id" position="before">
                     <field name="line_no" attrs="{'readonly': 1}" optional="hide"/>
                 </field>
@@ -74,6 +87,13 @@
                     <field name="qty_available" readonly="1" optional="hide"/>
                     <field name="qty_reserved" readonly="1" optional="hide"/>
                     <field name="suggest" readonly="1" widget="badge" decoration-danger="suggest == 'harus beli'" decoration-success="suggest == 'masih cukup'"/>
+                    <field name="delivery_amt" optional="hide"/>
+                    <field name="delivery_amt_per_item" optional="hide"/>
+                    <field name="contribution_delivery_amt" optional="hide"/>
+                    <field name="cost_service" optional="hide"/>
+                    <field name="cost_service_per_item" optional="hide"/>
+                    <field name="contribution_cost_service" optional="hide"/>
+                    <field name="ending_price" optional="hide"/>
                 <!-- <field name="suggest" readonly="1"/> -->
                 </field>
                 <field name="product_id" position="before">
@@ -137,7 +157,30 @@
             </field>
         </record>
     </data>
-    
+    <data>
+        <record id="view_purchase_order_unlock_wizard_form" model="ir.ui.view">
+            <field name="name">purchase.order.unlock.wizard.form</field>
+            <field name="model">purchase.order.unlock.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Reject Reason">
+                    <group>
+                        <field name="alasan" widget="text"/>
+                    </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_purchase_order_unlock_wizard" model="ir.actions.act_window">
+            <field name="name">Reject Reason</field>
+            <field name="res_model">purchase.order.unlock.wizard</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
 
     <data>
         <record id="rfq_order_tree_view_inherit" model="ir.ui.view">
@@ -153,6 +196,9 @@
                     <field name="logbook_bill_id" optional="hide"/>
                     <field name="status_printed" optional="hide"/>
                 </field>
+                <field name="partner_id" position="after">  
+                    <field name="store_name" optional="hide"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 7e759e31..bd664890 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -56,6 +56,9 @@
                 <field name="npwp" position="before">
                     <field name="customer_type" required="1"/>
                 </field>
+                <field name="alamat_lengkap_text" position="after">
+                    <field name="nitku" />
+                </field>
                 <field name="is_berikat" position="after">
                     <field name="pakta_integritas"/>
                 </field>
diff --git a/indoteknik_custom/views/res_users.xml b/indoteknik_custom/views/res_users.xml
index d7a6b2dd..9553bb91 100644
--- a/indoteknik_custom/views/res_users.xml
+++ b/indoteknik_custom/views/res_users.xml
@@ -5,7 +5,7 @@
             <field name="model_id" ref="base.model_res_users"/>
             <field name="subject">Aktivasi Akun - Indoteknik.com</field>
             <field name="email_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
-            <field name="reply_to">noreply@indoteknik.com</field>
+            <field name="reply_to">sales@indoteknik.com</field>
             <field name="email_to">${object.login | safe}</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;">
@@ -45,6 +45,11 @@
                                             <tr><td style="padding-bottom: 2px;">Hormat kami,</td></tr>
                                             <tr><td style="padding-bottom: 2px;">PT. Indoteknik Dotcom Gemilang</td></tr>
                                             <tr>
+                                                <td valign="middle" align="left">
+                                                    <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" alt="Indoteknik" style="max-width: 50%; height: auto;"></img>
+                                                </td>
+                                            </tr>
+                                            <tr>
                                                 <td style="text-align:center;">
                                                     <hr width="100%"
                                                         style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
@@ -65,7 +70,7 @@
             <field name="model_id" ref="base.model_res_users"/>
             <field name="subject">Email Pendaftaran Bisnis dalam Proses Review</field>
             <field name="email_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
-            <field name="reply_to">noreply@indoteknik.com</field>
+            <field name="reply_to">sales@indoteknik.com</field>
             <field name="email_to">${object.login | safe}</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;">
@@ -105,6 +110,76 @@
                                             <tr><td style="padding-bottom: 2px;"><strong>Hormat kami,</strong></td></tr>
                                             <tr><td style="padding-bottom: 2px;">Indoteknik.com</td></tr>
                                             <tr>
+                                                <td valign="middle" align="left">
+                                                    <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" alt="Indoteknik" style="max-width: 50%; height: auto;"></img>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td style="text-align:center;">
+                                                    <hr width="100%"
+                                                        style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <!-- CONTENT -->
+                            </tbody>
+                        </table>
+                    </td></tr>
+                </table>
+            </field>
+        </record>
+        <record id="mail_template_res_user_company_request_switch" model="mail.template">
+            <field name="name">Users: Company Request</field>
+            <field name="model_id" ref="base.model_res_users"/>
+            <field name="subject">Email Pendaftaran Bisnis dalam Proses Review</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">${object.login | safe}</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;">
+                    <tr><td align="center">
+                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="font-size: 13px; padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
+                            <!-- HEADER -->
+                            <tbody>
+                                <tr>
+                                    <td align="center" style="min-width: 590px;">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                            <tr>
+                                                <td valign="middle">
+                                                    <span></span>
+                                                </td>
+                                            </tr>
+
+                                            <tr>
+                                                <td colspan="2" style="text-align:center;">
+                                                    <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <!-- CONTENT -->
+                                <tr>
+                                    <td align="center" style="min-width: 590px;">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                            <tr><td style="padding-bottom: 24px;"><b>Halo ${object.name},</b></td></tr>
+
+                                            <tr><td style="padding-bottom: 16px;">Terima kasih atas kepercayaan Anda dengan mendaftarkan bisnis Anda di Indoteknik.com. Permohonan Anda saat ini sedang dalam proses review oleh tim kami.</td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Saat ini, kami sedang melakukan pengecekan akhir pada data yang Anda berikan. Proses ini biasanya memakan waktu sekitar 2 x 24 jam.</td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Setelah proses review selesai, kami akan segera menginformasikan status akun bisnis Anda melalui email.</td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Jika ada pertanyaan lebih lanjut, jangan ragu untuk menghubungi kami di <a href="mailto:sales@indoteknik.com">sales@indoteknik.com</a> atau hubungi whatsapp kami di <a href="https://wa.me/6281717181922">0817-1718-1922</a></td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Terima kasih atas perhatiannya.</td></tr>
+
+                                            <tr><td style="padding-bottom: 2px;"><strong>Hormat kami,</strong></td></tr>
+                                            <tr><td style="padding-bottom: 2px;">Indoteknik.com</td></tr>
+                                            <tr>
+                                                <td valign="middle" align="left">
+                                                    <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" alt="Indoteknik" style="max-width: 50%; height: auto;"></img>
+                                                </td>
+                                            </tr>
+                                            <tr>
                                                 <td style="text-align:center;">
                                                     <hr width="100%"
                                                         style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
@@ -125,7 +200,7 @@
             <field name="model_id" ref="base.model_res_users"/>
             <field name="subject">Email Pendaftaran Bisnis Berhasil</field>
             <field name="email_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
-            <field name="reply_to">noreply@indoteknik.com</field>
+            <field name="reply_to">sales@indoteknik.com</field>
             <field name="email_to">${object.login | safe}</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;">
@@ -166,6 +241,74 @@
                                             <tr><td style="padding-bottom: 2px;"><b>Hormat kami,</b></td></tr>
                                             <tr><td style="padding-bottom: 2px;">Indoteknik.com</td></tr>
                                             <tr>
+                                                <td valign="middle" align="left">
+                                                    <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" alt="Indoteknik" style="max-width: 50%; height: auto;"></img>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td style="text-align:center;">
+                                                    <hr width="100%"
+                                                        style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <!-- CONTENT -->
+                            </tbody>
+                        </table>
+                    </td></tr>
+                </table>
+            </field>
+        </record>
+        <record id="mail_template_res_user_company_switch_approve" model="mail.template">
+            <field name="name">Users: Switch Account Success</field>
+            <field name="model_id" ref="base.model_res_users"/>
+            <field name="subject">Selamat! Bisnis Anda Sudah Naik Kelas Jadi PKP!</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">${object.login | safe}</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;">
+                    <tr><td align="center">
+                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="font-size: 13px; padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
+                            <!-- HEADER -->
+                            <tbody>
+                                <tr>
+                                    <td align="center" style="min-width: 590px;">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                            <tr>
+                                                <td valign="middle">
+                                                    <span></span>
+                                                </td>
+                                            </tr>
+
+                                            <tr>
+                                                <td colspan="2" style="text-align:center;">
+                                                    <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <!-- CONTENT -->
+                                <tr>
+                                    <td align="center" style="min-width: 590px;">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                            <tr><td style="padding-bottom: 24px;"><b>Hai ${object.parent_name},</b></td></tr>
+
+                                            <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;">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>
+                                            <tr><td style="padding-bottom: 2px;">Tim Indoteknik.com</td></tr>
+                                            <tr>
+                                                <td valign="middle" align="left">
+                                                    <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" alt="Indoteknik" style="max-width: 50%; height: auto;"></img>
+                                                </td>
+                                            </tr>
+                                            <tr>
                                                 <td style="text-align:center;">
                                                     <hr width="100%"
                                                         style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
@@ -186,7 +329,7 @@
             <field name="model_id" ref="base.model_res_users"/>
             <field name="subject">Email Pendaftaran Bisnis Tidak Berhasil</field>
             <field name="email_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
-            <field name="reply_to">noreply@indoteknik.com</field>
+            <field name="reply_to">sales@indoteknik.com</field>
             <field name="email_to">${object.login | safe}</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;">
@@ -239,6 +382,11 @@
                                             <tr><td style="padding-bottom: 2px;"><b>Hormat kami,</b></td></tr>
                                             <tr><td style="padding-bottom: 2px;">Indoteknik.com</td></tr>
                                             <tr>
+                                                <td valign="middle" align="left">
+                                                    <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" alt="Indoteknik" style="max-width: 50%; height: auto;"></img>
+                                                </td>
+                                            </tr>
+                                            <tr>
                                                 <td style="text-align:center;">
                                                     <hr width="100%"
                                                         style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 3539dbf3..008a04ed 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -14,7 +14,7 @@
                     <button name="sale_order_approve"
                             string="Ask Approval"
                             type="object"
-                            attrs="{'invisible': [('approval_status', 'in', ['pengajuan1', 'pengajuan2', 'approved'])]}"
+                            attrs="{'invisible': [('approval_status', '=', ['approved'])]}"
                     />
                     <button name="action_web_approve"
                             string="Web Approve"
diff --git a/indoteknik_custom/views/user_company_request.xml b/indoteknik_custom/views/user_company_request.xml
index 6d5642e6..88d04c64 100644
--- a/indoteknik_custom/views/user_company_request.xml
+++ b/indoteknik_custom/views/user_company_request.xml
@@ -8,7 +8,7 @@
                 <field name="user_id"/>
                 <field name="user_company_id"/>
                 <field name="user_input"/>
-                <field 
+                <field
                     name="is_approve"
                     widget="badge"
                     decoration-success="is_approve == 'approved'"
@@ -33,8 +33,8 @@
                             <field name="similar_company_ids" invisible="1"/>
                             <field name="user_company_id" domain="[('id', 'in', similar_company_ids)]"/>
                             <field name="user_input" readonly="1"/>
-                            <field 
-                                name="is_approve" 
+                            <field
+                                name="is_approve"
                                 required="1"
                                 decoration-success="is_approve == 'approved'"
                                 decoration-danger="is_approve == 'rejected'"
diff --git a/indoteknik_custom/views/user_pengajuan_tempo.xml b/indoteknik_custom/views/user_pengajuan_tempo.xml
index f9e747b3..33ad91cf 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo.xml
@@ -339,6 +339,6 @@
     </record>
 
     <!-- Menu item to access Pengajuan Tempo -->
-    <menuitem id="menu_user_pengajuan_tempo_root" name="Pengajuan Tempo" />
-    <menuitem id="menu_user_pengajuan_tempo" name="Pengajuan Tempo Records" parent="menu_user_pengajuan_tempo_root" action="action_user_pengajuan_tempo"/>
+<!--    <menuitem id="menu_user_pengajuan_tempo_root" name="Pengajuan Tempo" />-->
+<!--    <menuitem id="menu_user_pengajuan_tempo" name="Pengajuan Tempo Records" parent="menu_user_pengajuan_tempo_root" action="action_user_pengajuan_tempo"/>-->
 </odoo>