Merge branch 'odoo-backup' into cr/manzila-commision

# Conflicts:
#	indoteknik_custom/models/commision.py
#	indoteknik_custom/security/ir.model.access.csv

14 files changed, 173 insertions, 4 deletions

diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml
index 50a34e11..17263c3a 100644
--- a/indoteknik_custom/views/account_move.xml
+++ b/indoteknik_custom/views/account_move.xml
@@ -27,6 +27,7 @@
                 </field>
                 <field name="invoice_date" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'out_invoice')]}"/>
+                    <field name="purchase_order_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'in_invoice')]}"/>
                 </field>
                 <field name="ref" position="after">
                     <field name="sale_id" readonly="1" attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index dddefed4..7cdf3117 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -17,6 +17,8 @@
                     decoration-danger="payment_status == 'pending'"
                     widget="badge"/>
                 <field name="brand_ids" widget="many2many_tags"/>
+                <field name="grouped_so_number" readonly="1"/>
+                <field name="grouped_invoice_number" readonly="1"/>
             </tree>
         </field>
     </record>
@@ -77,6 +79,8 @@
                                 <field name="description"/>
                                 <field name="commision_percent"/>
                                 <field name="commision_amt"/>
+                                <field name="grouped_so_number" readonly="1"/>
+                                <field name="grouped_invoice_number" readonly="1"/>
                             </group>
                             <group>
                                 <div>
diff --git a/indoteknik_custom/views/product_product.xml b/indoteknik_custom/views/product_product.xml
index 71748e44..b214dc87 100644
--- a/indoteknik_custom/views/product_product.xml
+++ b/indoteknik_custom/views/product_product.xml
@@ -31,6 +31,14 @@
             <field name="code">model.action_sync_to_solr()</field>
         </record>
 
+        <record id="ir_actions_server_product_sla_generate" model="ir.actions.server">
+            <field name="name">Generate Product SLA</field>
+            <field name="model_id" ref="product.model_product_product"/>
+            <field name="binding_model_id" ref="product.model_product_product"/>
+            <field name="state">code</field>
+            <field name="code">model.generate_product_sla()</field>
+        </record>
+
         <data noupdate="1">
             <record id="cron_variant_solr_flag_solr" model="ir.cron">
                 <field name="name">Sync Variant To Solr: Solr Flag 2</field>
diff --git a/indoteknik_custom/views/product_sla.xml b/indoteknik_custom/views/product_sla.xml
index 8b0e874b..9179730f 100644
--- a/indoteknik_custom/views/product_sla.xml
+++ b/indoteknik_custom/views/product_sla.xml
@@ -6,7 +6,9 @@
         <field name="arch" type="xml">
             <tree create="false">
                 <field name="product_variant_id"/>
-                <field name="avg_leadtime"/>
+                <field name="sla_vendor_id" string="Name Vendor"/>
+                <field name="sla_vendor_duration" string="SLA Vendor"/>
+                <field name="sla_logistic_duration_unit" string="SLA Logistic"/>
                 <field name="sla"/>
             </tree>
         </field>
@@ -21,7 +23,8 @@
                     <group>
                         <group>
                             <field name="product_variant_id"/>
-                            <field name="avg_leadtime"/>
+                            <field name="sla_logistic"/>
+                            <field name="sla_logistic_unit"/>
                             <field name="sla"/>
                             <field name="version"/>
                         </group>
diff --git a/indoteknik_custom/views/public_holiday.xml b/indoteknik_custom/views/public_holiday.xml
new file mode 100644
index 00000000..146c5b0b
--- /dev/null
+++ b/indoteknik_custom/views/public_holiday.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <!-- Security Access Rights -->
+        <record id="model_hr_public_holiday_access" model="ir.model.access">
+            <field name="name">hr.public.holiday access</field>
+            <field name="model_id" ref="model_hr_public_holiday"/>
+            <field name="group_id" eval="False"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
+        </record>
+
+        <!-- Public Holiday Form View -->
+        <record id="view_hr_public_holiday_form" model="ir.ui.view">
+            <field name="name">hr.public.holiday.form</field>
+            <field name="model">hr.public.holiday</field>
+            <field name="arch" type="xml">
+                <form string="Public Holiday">
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="start_date"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_hr_public_holiday_tree" model="ir.ui.view">
+            <field name="name">hr.public.holiday.tree</field>
+            <field name="model">hr.public.holiday</field>
+            <field name="arch" type="xml">
+                <tree string="Public Holidays">
+                    <field name="name"/>
+                    <field name="start_date"/>
+                </tree>
+            </field>
+        </record>
+        <record id="action_hr_public_holiday" model="ir.actions.act_window">
+            <field name="name">Public Holidays</field>
+            <field name="res_model">hr.public.holiday</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="hr_public_holiday"
+            name="Public Holiday"
+            parent="website_sale.menu_orders"
+            sequence="1"
+            action="action_hr_public_holiday"
+        />
+    </data>
+</odoo>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index a57bd467..36c0db13 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -331,6 +331,15 @@
         </record>
     </data>
     <data>
+        <record id="purchase_order_multi_ask_approval_ir_actions_server" model="ir.actions.server">
+            <field name="name">Ask Approval PO</field>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
+            <field name="binding_model_id" ref="purchase.model_purchase_order"/>
+            <field name="state">code</field>
+            <field name="code">action = records.open_form_multi_ask_approval_po()</field>
+        </record>
+    </data>
+    <data>
         <record id="purchase_order_multi_create_uangmuka_ir_actions_server" model="ir.actions.server">
             <field name="name">Uang Muka</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
diff --git a/indoteknik_custom/views/purchase_order_multi_ask_approval.xml b/indoteknik_custom/views/purchase_order_multi_ask_approval.xml
new file mode 100644
index 00000000..887ac0bd
--- /dev/null
+++ b/indoteknik_custom/views/purchase_order_multi_ask_approval.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="view_purchase_order_multi_ask_approval_po_form" model="ir.ui.view">
+            <field name="name">Purchase Order Multi ask_approval</field>
+            <field name="model">purchase.order.multi_ask_approval</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                           <span>Apakah Anda Yakin Ingin Ask Approval PO Tersebut?</span> 
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button name="save_multi_ask_approval_po" string="Ask Approval PO" type="object" default_focus="1" class="oe_highlight"/>
+                        <button string="Cancel" class="btn btn-secondary" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_purchase_order_multi_ask_approval" model="ir.actions.act_window">
+            <field name="name">Purchase Order Multi ask_approval</field>
+            <field name="res_model">purchase.order.multi_ask_approval</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_purchase_order_multi_ask_approval_po_form"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index af5e0db3..cb9fa3ac 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -131,6 +131,7 @@
                         <group string="Pengiriman" colspan="4">
                             <group>
                                 <field name="pic_name"/>
+                                <field name="pic_mobile"/>
                                 <field name="street_pengiriman"/>
                                 <field name="state_id_pengiriman"/>
                                 <field name="city_id_pengiriman"/>
@@ -140,6 +141,7 @@
                             </group>
                             <group>
                                 <field name="invoice_pic"/>
+                                <field name="invoice_pic_mobile"/>
                                 <field name="street_invoice"/>
                                 <field name="state_id_invoice"/>
                                 <field name="city_id_invoice"/>
@@ -150,6 +152,7 @@
                             <group>
                                 <field name="tukar_invoice"/>
                                 <field name="jadwal_bayar"/>
+                                <field name="dokumen_prosedur"  />
                                 <field name="dokumen_pengiriman"/>
                                 <field name="dokumen_pengiriman_input"/>
                                 <field name="dokumen_invoice"/>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 163330c5..0d190f37 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -68,7 +68,10 @@
                     <field name="compute_fullfillment" invisible="1"/>
                 </field>
                 <field name="tag_ids" position="after">
+                    <field name="eta_date_start"/>
+                    <t t-esc="' to '"/>
                     <field name="eta_date" readonly="1"/>
+                    <field name="expected_ready_to_ship" />
                     <field name="flash_sale"/>
                     <field name="margin_after_delivery_purchase"/>
                     <field name="percent_margin_after_delivery_purchase"/>
@@ -97,6 +100,7 @@
                     <field name="sales_tax_id" domain="[('type_tax_use','=','sale'), ('active', '=', True)]" required="1"/>
                     <field name="carrier_id" required="1"/>
                     <field name="delivery_service_type" readonly="1"/>
+                    <field name="shipping_option_id"/>
                 </field>
                 <field name="medium_id" position="after">
                     <field name="date_doc_kirim" readonly="1"/>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 50ea40bf..dadd5021 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -7,7 +7,8 @@
             <field name="inherit_id" ref="stock.vpicktree"/>
             <field name="arch" type="xml">
                 <tree position="attributes">
-                    <attribute name="default_order">create_date desc</attribute>
+                    <attribute name="default_order">final_seq asc</attribute>
+                   <!-- <attribute name="default_order">create_date desc</attribute> -->
                 </tree>
                 <field name="json_popover" position="after">
                     <field name="date_done" optional="hide"/>
@@ -18,6 +19,9 @@
                     <field name="note" optional="hide"/>
                     <field name="date_reserved" optional="hide"/>
                     <field name="state_reserve" optional="hide"/>
+                    <field name="final_seq"/> 
+                    <!-- <field name="countdown_hours" optional="hide"/>
+                    <field name="countdown_ready_to_ship" /> -->
                 </field>
                 <field name="partner_id" position="after">
                     <field name="purchase_representative_id"/>
diff --git a/indoteknik_custom/views/user_pengajuan_tempo.xml b/indoteknik_custom/views/user_pengajuan_tempo.xml
index 7f1faa41..4eebe9e4 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo.xml
@@ -53,6 +53,7 @@
                     <group string="Pengiriman" colspan="4">
                         <group>
                             <field name="pic_name"/>
+                            <field name="pic_mobile"/>
                             <field name="street_pengiriman"/>
                             <field name="state_id_pengiriman"/>
                             <field name="city_id_pengiriman"/>
@@ -62,6 +63,7 @@
                         </group>
                         <group>
                             <field name="invoice_pic"/>
+                            <field name="invoice_pic_mobile"/>
                             <field name="street_invoice"/>
                             <field name="state_id_invoice"/>
                             <field name="city_id_invoice"/>
diff --git a/indoteknik_custom/views/user_pengajuan_tempo_request.xml b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
index 7063231b..339ce8db 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo_request.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
@@ -102,6 +102,7 @@
                     <Page string="Pengiriman">
                         <group>
                             <field name="pic_name"/>
+                            <field name="pic_mobile"/>
                             <field name="street_pengiriman"/>
                             <field name="state_id_pengiriman"/>
                             <field name="city_id_pengiriman"/>
@@ -111,6 +112,7 @@
                         </group>
                         <group>
                             <field name="invoice_pic"/>
+                            <field name="invoice_pic_mobile"/>
                             <field name="street_invoice"/>
                             <field name="state_id_invoice"/>
                             <field name="city_id_invoice"/>
@@ -121,6 +123,7 @@
                         <group>
                             <field name="tukar_invoice"/>
                             <field name="jadwal_bayar"/>
+                            <field name="dokumen_prosedur" widget="many2many_binary"/>
                             <field name="dokumen_pengiriman"/>
                             <field name="dokumen_pengiriman_input"/>
                             <field name="dokumen_invoice"/>
diff --git a/indoteknik_custom/views/vendor_sla.xml b/indoteknik_custom/views/vendor_sla.xml
new file mode 100644
index 00000000..cf4425eb
--- /dev/null
+++ b/indoteknik_custom/views/vendor_sla.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="vendor_action" model="ir.actions.act_window">
+        <field name="name">Vendor SLA</field>
+        <field name="res_model">vendor.sla</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <record id="vendor_tree" model="ir.ui.view">
+        <field name="name">Vendor SLA</field>
+        <field name="model">vendor.sla</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="id_vendor" string="Vendor Name" />
+                <field name="duration_unit" string="Duration" />
+            </tree>
+        </field>
+    </record>
+
+    <record id="vendor_sla_view" model="ir.ui.view">
+        <field name="name">Vendor SLA</field>
+        <field name="model">vendor.sla</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="id_vendor" string="Vendor Name" />
+                        <field name="duration" string="SLA Duration" />
+                        <field name="unit" string="SLA Time" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <menuitem id="menu_vendor_sla"
+        name="Vendor SLA"
+        parent="menu_monitoring_in_purchase"
+        sequence="1"
+        action="vendor_action"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/x_banner_category.xml b/indoteknik_custom/views/x_banner_category.xml
index 11feb207..a83c4129 100755
--- a/indoteknik_custom/views/x_banner_category.xml
+++ b/indoteknik_custom/views/x_banner_category.xml
@@ -23,7 +23,7 @@
                         <group>
                             <field name="x_name"/>
                             <field name="x_banner_subtitle"/>
-                            <field name="x_studio_field_KKVl4"/>
+                            <field name="x_studio_field_KKVl4"/> 
                             <field name="last_update_solr" readonly="1"/>
                         </group>
                         <group></group>