Merge branch 'production' of https://bitbucket.org/altafixco/indoteknik-addons into production

14 files changed, 497 insertions, 121 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 93145fea..2863af57 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -85,6 +85,7 @@
                 </field>
                 <field name="invoice_date_due" position="after">
                     <field name="new_due_date" optional="hide"/>
+                    <field name="is_efaktur_exported" optional="hide"/>
                     <field name="invoice_day_to_due" attrs="{'invisible': [['payment_state', 'in', ('paid', 'in_payment', 'reversed')]]}" optional="hide"/>
                     <field name="new_invoice_day_to_due" attrs="{'invisible': [['payment_state', 'in', ('paid', 'in_payment', 'reversed')]]}" optional="hide"/>
                     <field name="mark_upload_efaktur" optional="hide" widget="badge" 
diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml
index 1c70cc7b..4acafb14 100644
--- a/indoteknik_custom/views/account_move_views.xml
+++ b/indoteknik_custom/views/account_move_views.xml
@@ -1,117 +1,157 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <record id="due_extension_tree" model="ir.ui.view">
-        <field name="name">due.extension.tree</field>
-        <field name="model">due.extension</field>
-        <field name="arch" type="xml">
-            <tree default_order="create_date desc" create="0">
-                <field name="number"/>
-                <field name="partner_id"/>
-                <field name="day_extension"/>
-                <field name="description"/>
-                <field name="approval_status"/>
-                <field name="is_approve"/>
-            </tree>
-        </field>
-    </record>
+    <data>
+        <record id="due_extension_tree" model="ir.ui.view">
+            <field name="name">due.extension.tree</field>
+            <field name="model">due.extension</field>
+            <field name="arch" type="xml">
+                <tree default_order="create_date desc" create="0">
+                    <field name="number"/>
+                    <field name="partner_id"/>
+                    <field name="day_extension"/>
+                    <field name="description"/>
+                    <field name="approval_status"/>
+                    <field name="is_approve"/>
+                </tree>
+            </field>
+        </record>
 
-    <record id="due_extension_line_tree" model="ir.ui.view">
-        <field name="name">due.extension.line.tree</field>
-        <field name="model">due.extension.line</field>
-        <field name="arch" type="xml">
-            <tree>
-                <field name="partner_id"/>
-                <field name="invoice_id"/>
-                <field name="date_invoice"/>
-                <field name="due_date"/>
-                <field name="day_to_due"/>
-                <field name="efaktur_id"/>
-                <field name="reference"/>
-                <field name="total_amt"/>
-                <field name="open_amt"/>
-            </tree>
-        </field>
-    </record>
+        <record id="due_extension_line_tree" model="ir.ui.view">
+            <field name="name">due.extension.line.tree</field>
+            <field name="model">due.extension.line</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="partner_id"/>
+                    <field name="invoice_id"/>
+                    <field name="date_invoice"/>
+                    <field name="due_date"/>
+                    <field name="day_to_due"/>
+                    <field name="efaktur_id"/>
+                    <field name="reference"/>
+                    <field name="total_amt"/>
+                    <field name="open_amt"/>
+                </tree>
+            </field>
+        </record>
 
-    <record id="due_extension_form" model="ir.ui.view">
-        <field name="name">due.extension.form</field>
-        <field name="model">due.extension</field>
-        <field name="arch" type="xml">
-            <form create="false">
-                <header>
-                    <button name="approve_new_due"
-                        string="Approve"
-                        type="object"
-                    />
-                    <button name="due_extension_approval"
-                            string="Ask Approval"
+        <record id="due_extension_form" model="ir.ui.view">
+            <field name="name">due.extension.form</field>
+            <field name="model">due.extension</field>
+            <field name="arch" type="xml">
+                <form create="false">
+                    <header>
+                        <button name="approve_new_due"
+                            string="Approve"
                             type="object"
-                    />
-                    <button name="due_extension_cancel"
-                            string="Cancel"
-                            type="object"
-                    />
-                </header>
-                <sheet>
-                    <group>
+                        />
+                        <button name="due_extension_approval"
+                                string="Ask Approval"
+                                type="object"
+                        />
+                        <button name="due_extension_cancel"
+                                string="Cancel"
+                                type="object"
+                        />
+                    </header>
+                    <sheet>
                         <group>
-                            <field name="partner_id" readonly="1"/>
-                            <field name="day_extension" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
+                            <group>
+                                <field name="partner_id" readonly="1"/>
+                                <field name="day_extension" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
+                            </group>
+                            <group>
+                                <field name="is_approve" readonly="1"/>
+                                <field name="order_id" readonly="1"/>
+                                <field name="counter" readonly="1"/>
+                                <field name="approval_status" readonly="1"/>
+                            </group>
                         </group>
                         <group>
-                            <field name="is_approve" readonly="1"/>
-                            <field name="order_id" readonly="1"/>
-                            <field name="counter" readonly="1"/>
-                            <field name="approval_status" readonly="1"/>
+                            <field name="description" attrs="{'readonly': [('approval_status', '=', 'approved')]}"/>
                         </group>
-                    </group>
-                    <group>
-                        <field name="description" attrs="{'readonly': [('approval_status', '=', 'approved')]}"/>
-                    </group>
-                    <notebook>
-                        <page string="Invoices">
-                            <field name="due_line" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
-                        </page>
-                    </notebook>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" widget="mail_thread"/>
-                </div>
-            </form>
-        </field>
-    </record>
+                        <notebook>
+                            <page string="Invoices">
+                                <field name="due_line" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
 
-    <record id="due_extension_view_search" model="ir.ui.view">
-        <field name="name">due.extension.search.view</field> <!-- Made the name more descriptive -->
-        <field name="model">due.extension</field>
-        <field name="arch" type="xml">
-            <search string="Search Due Extension">
-                <field name="number"/>
-                <field name="partner_id"/>
-                <field name="invoice_id"/>
-                <field name="order_id"/>
-            </search>
-        </field>
-    </record>    
+        <record id="due_extension_view_search" model="ir.ui.view">
+            <field name="name">due.extension.search.view</field> <!-- Made the name more descriptive -->
+            <field name="model">due.extension</field>
+            <field name="arch" type="xml">
+                <search string="Search Due Extension">
+                    <field name="number"/>
+                    <field name="partner_id"/>
+                    <field name="invoice_id"/>
+                    <field name="order_id"/>
+                </search>
+            </field>
+        </record>    
 
-    <record id="due_extension_action" model="ir.actions.act_window">
-        <field name="name">Due Extension</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">due.extension</field>
-        <field name="view_mode">tree,form</field>
-    </record>
+        <record id="due_extension_action" model="ir.actions.act_window">
+            <field name="name">Due Extension</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">due.extension</field>
+            <field name="view_mode">tree,form</field>
+        </record>
 
-    <menuitem
-        id="menu_due_extension"
-        name="Due Extension"
-        parent="sale.product_menu_catalog"
-        sequence="4"
-        action="due_extension_action"
-    />
-    <menuitem id="menu_due_extension" name="Due Extension"
-        parent="account.menu_finance_receivables"
-        action="due_extension_action" 
-        sequence="100"
-    />
+        <menuitem
+            id="menu_due_extension"
+            name="Due Extension"
+            parent="sale.product_menu_catalog"
+            sequence="4"
+            action="due_extension_action"
+        />
+        <menuitem id="menu_due_extension" name="Due Extension"
+            parent="account.menu_finance_receivables"
+            action="due_extension_action" 
+            sequence="100"
+        />
+        
+        <record id="mail_template_due_extension_approve" model="mail.template">
+            <field name="name">Due Extension: Approve</field>
+            <field name="model_id" ref="indoteknik_custom.model_due_extension"/>
+            <field name="subject">Approval for Due Extension: DE ${object.name}</field>
+            <field name="email_from">"PT. Indoteknik Dotcom Gemilang" &lt;noreply@indoteknik.com&gt;</field>
+            <field name="reply_to">anto@indoteknik.co.id</field>
+            <field name="email_to">	${object.order_id.user_id.login | safe}</field>
+            <field name="body_html" type="html">
+                <p>Dear Anto,</p>
+                
+                <p>We would like to inform you that the due extension for the following document has been approved:</p>
+                
+                <table border="0" cellpadding="5" cellspacing="0" width="15%">
+                    <tr>
+                        <td><strong>DE Number:</strong></td>
+                        <td>${object.number}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>SO Number:</strong></td>
+                        <td>${object.order_id.name}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>New Due Date:</strong></td>
+                        <td>${object.due_line[0].invoice_id.new_due_date}</td>
+                    </tr>
+                    <tr>
+                        <td><strong>Extension (days):</strong></td>
+                        <td>${object.day_extension}</td>
+                    </tr>
+                </table>
+    
+                <p>If you have any further questions or need additional information, please feel free to contact us.</p>
+                
+                <p>Best regards,</p>
+                <p><strong>PT. Indoteknik Dotcom Gemilang</strong></p>
+            </field>
+        </record>
+    </data>    
 </odoo>
diff --git a/indoteknik_custom/views/approval_unreserve.xml b/indoteknik_custom/views/approval_unreserve.xml
new file mode 100644
index 00000000..317b5276
--- /dev/null
+++ b/indoteknik_custom/views/approval_unreserve.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="view_approval_unreserve_tree" model="ir.ui.view">
+        <field name="name">approval.unreserve.tree</field>
+        <field name="model">approval.unreserve</field>
+        <field name="arch" type="xml">
+            <tree string="Approval Unreserve">
+                <field name="number"/>
+                <field name="request_date"/>
+                <field name="picking_id"/>
+                <field name="state"/>
+                <field name="user_id"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record id="approval_unreserve_line_tree" model="ir.ui.view">
+        <field name="name">approval.unreserve.line.tree</field>
+        <field name="model">approval.unreserve.line</field>
+        <field name="arch" type="xml">
+            <tree editable="bottom">
+                <field name="move_id"/>
+                <field name="product_id"/>
+                <field name="dest_picking_id"/>
+                <field name="sales_id"/>
+                <field name="unreserve_qty"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record id="approval_unreserve_form" model="ir.ui.view">
+        <field name="name">approval.unreserve.form</field>
+        <field name="model">approval.unreserve</field>
+        <field name="arch" type="xml">
+            <form create="false">
+                <header>
+                    <button name="action_submit_for_approval" type="object" string="Submit for Approval" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+                    <button name="action_approve" type="object" string="Approve" attrs="{'invisible': [('state', '!=', 'waiting_approval')]}"/>
+                    <button name="action_reject" type="object" string="Reject" attrs="{'invisible': [('state', '!=', 'waiting_approval')]}"/>
+                </header>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="number" readonly="1"/>
+                            <field name="request_date" readonly="1"/>
+                            <field name="picking_id"/>
+                            <field name="user_id" readonly="1"/>
+                            <field name="state" readonly="1"/>
+                            <field name="approved_by" readonly="1"/>
+                            <field name="reason"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Lines">
+                            <field name="approval_line"/>    
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="approval_unreserve_action" model="ir.actions.act_window">
+        <field name="name">Approval Unreserve</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">approval.unreserve</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        id="menu_approval_unreserve"
+        name="Approval Unreserve"
+        parent="sale.product_menu_catalog"
+        sequence="4"
+        action="approval_unreserve_action"
+    />
+</odoo>
diff --git a/indoteknik_custom/views/bill_receipt.xml b/indoteknik_custom/views/bill_receipt.xml
index 15d82e7b..02b28ddf 100644
--- a/indoteknik_custom/views/bill_receipt.xml
+++ b/indoteknik_custom/views/bill_receipt.xml
@@ -13,6 +13,7 @@
                 <field name="resi_tukar_faktur"/>
                 <field name="date_terima_tukar_faktur"/>
                 <field name="shipper_faktur_id"/>
+                <field name="grand_total"/>
             </tree>
         </field>
     </record>
@@ -69,6 +70,7 @@
                             <field name="resi_tukar_faktur"/>
                             <field name="date_terima_tukar_faktur"/>
                             <field name="shipper_faktur_id"/>    
+                            <field name="grand_total"/>    
                         </group>
                     </group>
                     <notebook>
diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index dd5bb120..522be8c9 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -13,6 +13,7 @@
                 <field name="resi_tukar_faktur"/>
                 <field name="date_terima_tukar_faktur"/>
                 <field name="shipper_faktur_id"/>
+                <field name="grand_total"/>
             </tree>
         </field>
     </record>
@@ -71,6 +72,7 @@
                                 <field name="resi_tukar_faktur"/>
                                 <field name="date_terima_tukar_faktur"/>
                                 <field name="shipper_faktur_id"/>
+                                <field name="grand_total"/>
                             </group>
                         </group>
                         <notebook>
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index b2768c71..dd501d8c 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -20,6 +20,16 @@
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
+        
+        <record id="sequence_approval_unreserve" model="ir.sequence">
+            <field name="name">Approval Unreserve</field>
+            <field name="code">approval.unreserve</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">AU/%(year)s/</field>
+            <field name="padding">5</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+        </record>
 
         <record id="sequence_logbook_sj" model="ir.sequence">
             <field name="name">Logbook SJ</field>
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index b6155eea..a77b99de 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -22,7 +22,7 @@
                     <field name="last_update_solr" readonly="1" />
                 </field>
                 <field name="public_categ_ids" position="attributes">
-                    <attribute name="required">1</attribute>
+                    <attribute name="required">0</attribute>
                 </field>
                 <field name="public_categ_ids" position="attributes">
                     <attribute name="options">{'no_create': True}</attribute>
diff --git a/indoteknik_custom/views/promotion/promotion_program_line.xml b/indoteknik_custom/views/promotion/promotion_program_line.xml
index f3c2eea1..9cda67a8 100644
--- a/indoteknik_custom/views/promotion/promotion_program_line.xml
+++ b/indoteknik_custom/views/promotion/promotion_program_line.xml
@@ -32,6 +32,11 @@
                             <field name="package_limit_user" />
                             <field name="package_limit_trx" />
                             <field name="price" attrs="{'invisible': [('promotion_type', '=', 'special_price')]}" />
+                            <field name="price_tier_1"/>
+                            <field name="price_tier_2" invisible="1"/>
+                            <field name="price_tier_3" invisible="1"/>
+                            <field name="price_tier_4" invisible="1"/>
+                            <field name="price_tier_5" invisible="1"/>
                             <field name="sequence"/>
                             <field name="discount_type" attrs="{'invisible': [('promotion_type', '!=', 'special_price')]}" />
                             <field name="discount_amount" attrs="{'invisible': [('promotion_type', '!=', 'special_price')]}" />
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index c301f3d3..f6e5a1a4 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -26,15 +26,21 @@
                 <button name="button_unlock" position="after">
                     <button name="delete_line" type="object" string="Delete " states="draft"/>
                 </button>
+                <button name="button_unlock" position="after">
+                    <button name="create_bill_dp" string="Create Bill DP" type="object" class="oe_highlight" attrs="{'invisible': [('state', 'not in', ('purchase', 'done'))]}"/>
+                </button>
                 <field name="date_order" position="before">
                     <field name="sale_order_id" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
                     <field name="sale_order"/>
                     <field name="is_create_uangmuka"/>
                     <field name="approval_status"/>
-                    <field name="amount_total_without_service"/>
                 </field>
                 <field name="approval_status" position="after">
-                    <field name="revisi_po" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
+                    <field name="revisi_po"/>
+                </field>
+                <field name="incoterm_id" position="after">
+                    <field name="amount_total_without_service"/>
+                    <field name="delivery_amt"/>
                 </field>
                 <field name="currency_id" position="after">
                     <field name="summary_qty_po"/>
@@ -88,6 +94,7 @@
                     <field name="from_apo"/>
                     <field name="approval_edit_line"/>
                     <field name="logbook_bill_id"/>
+                    <field name="bills_dp_id" readonly="1"/>
                 </field>
 
                 <field name="order_line" position="attributes">
@@ -229,6 +236,9 @@
                     <field name="product_id"/>
                     <field name="qty_so"/>
                     <field name="qty_po"/>
+                    <field name="margin_item" optional="hide"/>
+                    <field name="delivery_amt" optional="hide"/>
+                    <field name="margin_deduct" optional="hide"/>
                     <field name="margin_so"/>
                 </tree>
             </field>
diff --git a/indoteknik_custom/views/res_users.xml b/indoteknik_custom/views/res_users.xml
index 976f46c9..39b9d43e 100644
--- a/indoteknik_custom/views/res_users.xml
+++ b/indoteknik_custom/views/res_users.xml
@@ -4,7 +4,8 @@
             <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_from">"Indoteknik.com" &lt;noreply@indoteknik.com&gt;</field>
+            <field name="reply_to">noreply@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;">
@@ -59,5 +60,199 @@
                 </table>
             </field>
         </record>
+        <record id="mail_template_res_user_company_request" 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">noreply@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.parent_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 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_approve" model="mail.template">
+            <field name="name">Users: Company Request Approve</field>
+            <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="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>Yth. ${object.parent_name},</b></td></tr>
+
+                                            <tr><td style="padding-bottom: 16px;">Selamat! Pendaftaran akun bisnis Anda di indoteknik.com telah <b>berhasil diverifikasi &amp; sudah aktif.</b> kini anda dapat menikmati berbagai kemudahan dalam berbelanja, antara lain:</td></tr>
+                                            <tr><td style="padding-bottom: 16px;"><b>Fitur Faktur Pajak &amp; Invoice:</b> Dengan mudah download faktur pajak &amp; Invoice Anda secara digital.</td></tr>
+                                            <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;">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>
+                                            <tr><td style="padding-bottom: 2px;">Indoteknik.com</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_reject" model="mail.template">
+            <field name="name">Users: Company Request Reject</field>
+            <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="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>Yth. ${object.parent_name},</b></td></tr>
+
+                                            <tr><td style="padding-bottom: 16px;">Terima kasih atas minat Anda untuk mendaftar akun bisnis di Indoteknik.com. Kami telah menerima permohonan pendaftaran Anda dan saat ini sedang dalam proses review.</td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Namun, setelah kami lakukan pengecekan, kami menemukan bahwa beberapa informasi yang Anda berikan masih belum lengkap. Untuk dapat melanjutkan proses pendaftaran, mohon kiranya Anda dapat melengkapi data-data berikut:</td></tr>
+                                           <tr>
+                                                <td style="padding-bottom: 8px; ">Informasi yang kami butuhkan saat ini adalah:</td>
+                                            </tr>
+                                            <tr>
+                                                <td style="padding: 4px 0; text-align: left;">
+                                                    <ol style="padding-left: 20px; margin: 0;">
+                                                        <li style="padding-bottom: 4px;">Detail Nama Bisnis</li>
+                                                        <li style="padding-bottom: 4px;">Dokumen NPWP</li>
+                                                        <li style="padding-bottom: 4px;">Dokumen SPPKP/Surat Pengukuhan Kena Pajak</li>
+                                                    </ol>
+                                                </td>
+                                            </tr>
+
+                                            <tr><td style="padding-bottom: 16px;">Anda dapat mengirimkan informasi yang kurang tersebut melalui email ini atau dengan menghubungi tim layanan pelanggan kami di <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: 16px;">Kami mohon maaf atas ketidaknyamanan ini dan berharap dapat segera menyelesaikan proses pendaftaran akun bisnis Anda.</td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Terima kasih atas perhatiannya.</td></tr>
+
+                                            <tr><td style="padding-bottom: 2px;"><b>Hormat kami,</b></td></tr>
+                                            <tr><td style="padding-bottom: 2px;">Indoteknik.com</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/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 1257ff85..17faaa95 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -32,6 +32,7 @@
                     <field name="delivery_amt"/>
                     <field name="fee_third_party"/>
                     <field name="total_percent_margin"/>
+                    <field name="type_promotion"/>
                     <label for="voucher_id"/>
                     <div class="o_row">
                         <field name="voucher_id" id="voucher_id" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_id', '!=', False)]}"/>
@@ -43,6 +44,17 @@
                             attrs="{'invisible': ['|', ('applied_voucher_id', '=', False), ('state', 'not in', ['draft','sent'])]}"
                         />
                     </div>
+                    <label for="voucher_shipping_id"/>
+                    <div class="o_row">
+                        <field name="voucher_shipping_id" id="voucher_shipping_id" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'sent']), ('applied_voucher_shipping_id', '!=', False)]}"/>
+                        <field name="applied_voucher_shipping_id" invisible="1" />
+                        <button name="action_apply_voucher_shipping" type="object" string="Apply" confirm="Anda yakin untuk menggunakan voucher?" help="Apply the selected voucher" class="btn-link mb-1 px-0" icon="fa-plus" 
+                            attrs="{'invisible': ['|', '|', ('voucher_id', '=', False), ('state', 'not in', ['draft', 'sent']), ('applied_voucher_shipping_id', '!=', False)]}"
+                        />
+                        <button name="cancel_voucher_shipping" type="object" string="Cancel" confirm="Anda yakin untuk membatalkan penggunaan voucher?" help="Cancel applied voucher" class="btn-link mb-1 px-0" icon="fa-times" 
+                            attrs="{'invisible': ['|', ('applied_voucher_shipping_id', '=', False), ('state', 'not in', ['draft','sent'])]}"
+                        />
+                    </div>
                     <button name="calculate_selling_price"
                             string="Calculate Selling Price"
                             type="object"
@@ -58,18 +70,22 @@
                 <field name="tag_ids" position="after">
                     <field name="eta_date" readonly="1"/>
                     <field name="flash_sale"/>
+                    <field name="margin_after_delivery_purchase"/>
+                    <field name="percent_margin_after_delivery_purchase"/>
                 </field>
                 <field name="analytic_account_id" position="after">
                     <field name="customer_type" required="1"/>
                     <field name="npwp" placeholder='99.999.999.9-999.999' required="1"/>
                     <field name="sppkp" attrs="{'required': [('customer_type', '=', 'pkp')]}"/>
                     <field name="email" required="1"/>
+                    <field name="unreserve_id"/>
                     <field name="due_id" readonly="1"/>
                     <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" required="1"/>
                     <button name="override_allow_create_invoice"
                             string="Override Create Invoice"
                             type="object"
                     />
+                    <button string="Estimate Shipping" type="object" name="action_estimate_shipping"/>
                 </field>
                 <field name="partner_shipping_id" position="after">
                     <field name="real_shipping_id"/>
@@ -112,9 +128,11 @@
                     "/>
                     <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]"/>
                     <field name="item_percent_margin"/>
+                    <field name="item_margin" optional="hide"/>
                     <field name="note" optional="hide"/>
                     <field name="note_procurement" optional="hide"/>
                     <field name="vendor_subtotal" optional="hide"/>
+                    <field name="weight" optional="hide"/>
                     <field name="amount_voucher_disc" string="Voucher" readonly="1" optional="hide"/>
                     <field name="order_promotion_id" string="Promotion" readonly="1" optional="hide"/>
                 </xpath>
@@ -138,6 +156,11 @@
                         <field class="mb-0" name="amount_voucher_disc" string="Voucher" readonly="1"/> 
                         <div class="text-right mb-2"><small>*Hanya informasi</small></div>
                     </div>
+                    <label for="amount_voucher_shipping_disc" string="Voucher Shipping" />
+                    <div>
+                        <field class="mb-0" name="amount_voucher_shipping_disc" string="Voucher Shipping" readonly="1"/> 
+                        <div class="text-right mb-2"><small>*Hanya informasi</small></div>
+                    </div>
                     <field name="total_margin"/>
                     <field name="total_percent_margin"/>
                 </field>
diff --git a/indoteknik_custom/views/user_company_request.xml b/indoteknik_custom/views/user_company_request.xml
index 2efc1e9b..c9edd3f8 100644
--- a/indoteknik_custom/views/user_company_request.xml
+++ b/indoteknik_custom/views/user_company_request.xml
@@ -4,7 +4,7 @@
         <field name="name">user.company.request.tree</field>
         <field name="model">user.company.request</field>
         <field name="arch" type="xml">
-            <tree create="0" default_order="is_approve desc">
+            <tree create="0" default_order="create_date desc">
                 <field name="user_id"/>
                 <field name="user_company_id"/>
                 <field name="user_input"/>
diff --git a/indoteknik_custom/views/website_categories_management.xml b/indoteknik_custom/views/website_categories_management.xml
index 648814e2..6ad85944 100644
--- a/indoteknik_custom/views/website_categories_management.xml
+++ b/indoteknik_custom/views/website_categories_management.xml
@@ -29,16 +29,16 @@
                             <group>
                                 <field name="sequence"/>
                                 <field name="category_id"/>
-                                <field name="category_id2" widget="many2many_tags"/>
                                 <field name="status"/>
                             </group>
                         </group>
                         <notebook>
-                            <page string="Detail category">
-                                <field name="category_id2">
+                            <page string="Category Level 2 Lines">
+                                <field name="line_ids">
                                     <tree editable="bottom">
-                                        <field name="name"/>
-                                        <field name="child_frontend_id2" widget="many2many_tags"/>
+                                        <field name="category_id2" domain="[('parent_frontend_id', '=', parent.category_id)]"/>  <!-- Category Level 2 -->
+                                        <field name="category_id3_ids" widget="many2many_tags"/>  <!-- Category Level 3 -->
+                                        <field name="sequence" widget="handle" />
                                     </tree>
                                 </field>
                             </page>
@@ -48,13 +48,13 @@
             </field>
         </record>
 
-<!--        <record id="ir_actions_server_website_categories_management_sync_to_solr" model="ir.actions.server">-->
-<!--            <field name="name">Sync to solr</field>-->
-<!--            <field name="model_id" ref="indoteknik_custom.model_website_categories_management"/>-->
-<!--            <field name="binding_model_id" ref="indoteknik_custom.model_website_categories_management"/>-->
-<!--            <field name="state">code</field>-->
-<!--            <field name="code">model.action_sync_to_solr()</field>-->
-<!--        </record>-->
+        <record id="ir_actions_server_website_categories_management_sync_to_solr" model="ir.actions.server">
+            <field name="name">Sync to solr</field>
+            <field name="model_id" ref="indoteknik_custom.model_website_categories_management"/>
+            <field name="binding_model_id" ref="indoteknik_custom.model_website_categories_management"/>
+            <field name="state">code</field>
+            <field name="code">model.action_sync_to_solr()</field>
+        </record>
 
         <menuitem
             id="website_categories_management"
diff --git a/indoteknik_custom/views/website_user_cart.xml b/indoteknik_custom/views/website_user_cart.xml
index 11573121..b4fb02be 100755
--- a/indoteknik_custom/views/website_user_cart.xml
+++ b/indoteknik_custom/views/website_user_cart.xml
@@ -11,13 +11,17 @@
             <field name="model">website.user.cart</field>
             <field name="arch" type="xml">
                 <tree>
+                    <field name="create_date"/>
                     <field name="user_id"/>
                     <field name="product_id"/>
+                    <field name="phone_user"/>
+                    <field name="price"/>
                     <field name="program_line_id"/>
                     <field name="qty"/>
                     <field name="is_selected"/>
                     <field name="is_reminder"/>
                     <field name="source"/>
+                    <field name="program_product_id" optional="hide"/>
                 </tree>
             </field>
         </record>
@@ -37,6 +41,9 @@
                                 <field name="is_selected" />
                                 <field name="is_reminder" />
                                 <field name="source" />
+                                <field name="phone_user"/>
+                                <field name="program_product_id"/>
+                                <field name="price"/>
                             </group>
                             <group></group>
                         </group>