Merge branch 'production' into iman/new-register

# Conflicts:
#	indoteknik_custom/models/res_users.py

8 files changed, 78 insertions, 16 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/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 567d5e8c..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,12 +72,20 @@
                                 <field name="resi_tukar_faktur"/>
                                 <field name="date_terima_tukar_faktur"/>
                                 <field name="shipper_faktur_id"/>
+                                <field name="grand_total"/>
                             </group>
                         </group>
                         <notebook>
                             <page id="invoice_tab" string="Invoices">
                                 <field name="dunning_line"/>
                             </page>
+                            <page id="others_tab" string="Others">
+                                <group>
+                                    <field name="is_paid" readonly="1"/>
+                                    <field name="description" readonly="1"/>
+                                    <field name="comment" readonly="1"/>
+                                </group>
+                            </page>
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
diff --git a/indoteknik_custom/views/product_pricelist.xml b/indoteknik_custom/views/product_pricelist.xml
index 0dfb69db..6eff0153 100644
--- a/indoteknik_custom/views/product_pricelist.xml
+++ b/indoteknik_custom/views/product_pricelist.xml
@@ -26,4 +26,18 @@
             </page>
         </field>
     </record>
+
+    <data noupdate="1">
+        <record id="ir_cron_check_end_date" model="ir.cron">
+            <field name="name">Pricelist: Check End Date and Update Solr</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="model_id" ref="model_product_pricelist"/>
+            <field name="code">model._check_end_date_and_update_solr()</field>
+            <field name="state">code</field>
+            <field name="priority">55</field>
+        </record>
+    </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index 520af5c8..b6155eea 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <field name="categ_id" position="after">
                     <field name="web_tax_id" domain="[('type_tax_use','=','sale'), ('active', '=', True)]"/>
-                    <field name="x_manufacture"/>
+                    <field name="x_manufacture" options="{'no_create': True}"/>
                     <field name="x_model_product"/>
                     <field name="kind_of"/>
                     <field name="x_studio_field_tGhJR" widget="many2many_tags"/>
@@ -21,6 +21,12 @@
                     <field name="desc_update_solr" readonly="1" />
                     <field name="last_update_solr" readonly="1" />
                 </field>
+                <field name="public_categ_ids" position="attributes">
+                    <attribute name="required">1</attribute>
+                </field>
+                <field name="public_categ_ids" position="attributes">
+                    <attribute name="options">{'no_create': True}</attribute>
+                </field>
                 <page name="inventory" position="after">
                     <page string="Marketplace" name="marketplace">
                         <group>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index 25b7787b..ce127fdd 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -26,20 +26,26 @@
                 <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" context="{'create_bill':True}" attrs="{'invisible': ['|', ('state', 'not in', ('purchase', 'done')), ('invoice_status', 'in', ('no', 'invoiced'))]}"/>
+                </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" invisible="1"/>
+                </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"/>
                     <field name="count_line_product"/>
-                    <field name="payment_term_id" required="1"/>
+                    <field name="payment_term_id" readonly="1"/>
                 </field>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
@@ -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/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 1257ff85..f2789254 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,6 +70,8 @@
                 <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"/>
@@ -112,6 +126,7 @@
                     "/>
                     <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"/>
@@ -138,6 +153,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/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"