Merged in production (pull request #132)

Production

6 files changed, 78 insertions, 0 deletions

diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 008c79f8..993521ca 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -72,6 +72,14 @@
                             <page string="Lines">
                                 <field name="commision_lines"/>
                             </page>
+                            <page string="Other Info" name="customer_commision_info">
+                                <group>
+                                    <field name="bank_name"/>
+                                    <field name="account_name"/>
+                                    <field name="bank_account"/>
+                                    <field name="note_transfer"/>
+                                </group>
+                            </page>
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index bc84bcd1..08dde8e1 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -80,6 +80,7 @@
                     <field name="total_so_percent_margin"/>
                     <field name="has_active_invoice" invisible="1" />
                     <field name="responsible_ids" widget="many2many_tags"/>
+                    <field name="status_paid_cbd"/>
                 </field>
 
                 <field name="order_line" position="attributes">
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index c1ae3ed3..58fff00a 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -20,6 +20,9 @@
                 <field name="npwp" position="before">
                     <field name="customer_type"/>
                 </field>
+                <field name="is_berikat" position="after">
+                    <field name="pakta_integritas"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/res_users.xml b/indoteknik_custom/views/res_users.xml
new file mode 100644
index 00000000..976f46c9
--- /dev/null
+++ b/indoteknik_custom/views/res_users.xml
@@ -0,0 +1,63 @@
+<odoo>
+    <data>
+        <record id="mail_template_res_user_activation_request" model="mail.template">
+            <field name="name">Users: Activation Request</field>
+            <field name="model_id" ref="base.model_res_users"/>
+            <field name="subject">Aktivasi Akun - Indoteknik.com</field>
+            <field name="email_from">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;">Dear ${object.name},</td></tr>
+
+                                            <tr><td style="padding-bottom: 16px;">Kami senang Anda bergabung dengan Indoteknik.</td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Untuk mengaktifkan akun anda salin kode OTP berikut <strong>${object.otp_code}</strong>, lalu masukan pada kolom yang disediakan pada website Indoteknik.com</td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Atau anda dapat klik tautan berikut: <a href="${object.get_activation_token_url() | safe}">Aktivasi akun</a></td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Jika anda mengalami kesulitan atau memiliki pertanyaan, hubungi tim dukungan kami melalui email <a href="mailto:sales@indoteknik.com">sales@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('activation')}</strong></td></tr>
+
+                                            <tr><td style="padding-bottom: 2px;">Hormat kami,</td></tr>
+                                            <tr><td style="padding-bottom: 2px;">PT. Indoteknik Dotcom Gemilang</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>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/users.xml b/indoteknik_custom/views/users.xml
index 020d8ddc..6519aeaa 100644
--- a/indoteknik_custom/views/users.xml
+++ b/indoteknik_custom/views/users.xml
@@ -14,6 +14,8 @@
                     <field name="is_logistic_approver"/>
                     <field name="is_editor_product"/>
                     <field name="is_admin_reconcile"/>
+                    <field name="is_outbound"/>
+                    <field name="is_inbound"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml
index b8489942..71c0df0b 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="show_on_email" />
                                 <field name="excl_pricelist_ids" widget="many2many_tags" domain="[('id', 'in', [4, 15037, 15038, 15039, 17023, 17024, 17025, 17026,17027])]"/>
                             </group>
                             <group string="Discount Settings" attrs="{'invisible': [('apply_type', '!=', 'all')]}">