Merge branch 'odoo-production' into CR/form-merchant

# Conflicts:
#	indoteknik_api/models/res_partner.py
#	indoteknik_api/models/res_users.py
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/__init__.py
#	indoteknik_custom/models/res_partner.py
#	indoteknik_custom/security/ir.model.access.csv
#	indoteknik_custom/views/res_partner.xml
#	indoteknik_custom/views/user_company_request.xml

1 files changed, 154 insertions, 4 deletions

diff --git a/indoteknik_custom/views/res_users.xml b/indoteknik_custom/views/res_users.xml
index 39b9d43e..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;" />
@@ -254,5 +402,7 @@
                 </table>
             </field>
         </record>
+
+
     </data>
 </odoo>
\ No newline at end of file