Merge branch 'production' into iman/switch-account

# Conflicts:
#	indoteknik_api/controllers/api_v1/user.py
#	indoteknik_custom/models/user_company_request.py

13 files changed, 244 insertions, 10 deletions

diff --git a/indoteknik_custom/views/account_move_views.xml b/indoteknik_custom/views/account_move_views.xml
index 4acafb14..da25636e 100644
--- a/indoteknik_custom/views/account_move_views.xml
+++ b/indoteknik_custom/views/account_move_views.xml
@@ -12,6 +12,10 @@
                     <field name="description"/>
                     <field name="approval_status"/>
                     <field name="is_approve"/>
+                    <field name="approve_by" optional="hide"/>
+                    <field name="date_approve" optional="hide"/>
+                    <field name="create_uid" optional="hide"/>
+                    <field name="create_date" optional="hide"/>
                 </tree>
             </field>
         </record>
@@ -58,12 +62,14 @@
                             <group>
                                 <field name="partner_id" readonly="1"/>
                                 <field name="day_extension" attrs="{'readonly': [('is_approve', '=', True)]}"/>    
+                                <field name="order_id" readonly="1"/>
                             </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="approve_by" readonly="1"/>
+                                <field name="date_approve" readonly="1"/>
                             </group>
                         </group>
                         <group>
diff --git a/indoteknik_custom/views/dunning_run.xml b/indoteknik_custom/views/dunning_run.xml
index 522be8c9..2117a7bb 100644
--- a/indoteknik_custom/views/dunning_run.xml
+++ b/indoteknik_custom/views/dunning_run.xml
@@ -14,6 +14,7 @@
                 <field name="date_terima_tukar_faktur"/>
                 <field name="shipper_faktur_id"/>
                 <field name="grand_total"/>
+                <field name="create_uid" optional="hide"/>
             </tree>
         </field>
     </record>
diff --git a/indoteknik_custom/views/find_page.xml b/indoteknik_custom/views/find_page.xml
new file mode 100644
index 00000000..c752aa98
--- /dev/null
+++ b/indoteknik_custom/views/find_page.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="web_find_page_tree" model="ir.ui.view">
+        <field name="name">web.find.page.tree</field>
+        <field name="model">web.find.page</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="category_id"/>
+                <field name="brand_id"/>
+                <field name="url"/>
+                <field name="create_uid"/>
+                <field name="write_uid"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="web_find_page_form" model="ir.ui.view">
+        <field name="name">web.find.page.form</field>
+        <field name="model">web.find.page</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet string="Web Find Page">
+                        <div class="oe_button_box" name="button_box"/>
+                        <group>
+                            <group>
+                                <field name="category_id"/>
+                                <field name="brand_id"/>
+                                <field name="url"/>
+                            </group>
+                            <group>
+                                <field name="create_uid"/>
+                                <field name="write_uid"/>
+                            </group>
+                        </group>
+                    </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="view_web_find_page_filter" model="ir.ui.view">
+        <field name="name">web.find.page.list.select</field>
+        <field name="model">web.find.page</field>
+        <field name="priority" eval="15"/>
+        <field name="arch" type="xml">
+            <search string="Search Web Find Page">
+                <field name="category_id"/>
+                <field name="brand_id"/>
+                <field name="url"/>
+           </search>
+        </field>
+    </record>
+
+    <record id="web_find_page_action" model="ir.actions.act_window">
+        <field name="name">Web Find Page</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">web.find.page</field>
+        <field name="search_view_id" ref="view_web_find_page_filter"/>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_web_find_page"
+        name="Web Find Page"
+        action="web_find_page_action"
+        parent="website_sale.menu_orders"
+        sequence="8"/>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index dd501d8c..dfb56100 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -21,6 +21,16 @@
             <field name="number_increment">1</field>
         </record>
         
+        <record id="sequence_vendor_approval" model="ir.sequence">
+            <field name="name">Vendor Approval</field>
+            <field name="code">vendor.approval</field>
+            <field name="active">TRUE</field>
+            <field name="prefix">VA/%(year)s/</field>
+            <field name="padding">5</field>
+            <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>
diff --git a/indoteknik_custom/views/product_template.xml b/indoteknik_custom/views/product_template.xml
index a77b99de..5a509ebd 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -39,12 +39,23 @@
                         </group>
                     </page>
                 </page>
-				<field name="supplier_taxes_id" position="after">
+                <field name="supplier_taxes_id" position="after">
                     <field name="supplier_url" widget="url"/>
                 </field>
             </field>
         </record>
-
+        
+        <record id="product_normal_form_view_inherit" model="ir.ui.view">
+            <field name="name">Product Template</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <field name="last_update_solr" position="after">
+                    <field name="clean_website_description" />
+                </field>
+            </field>
+        </record>
+        
         <record id="x_manufactures_group_by" model="ir.ui.view">
             <field name="name">product.template.search.inherit</field>
             <field name="model">product.template</field>
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index f6e5a1a4..3e609f15 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -41,11 +41,12 @@
                 <field name="incoterm_id" position="after">
                     <field name="amount_total_without_service"/>
                     <field name="delivery_amt"/>
+                    <field name="approve_by"/>
                 </field>
                 <field name="currency_id" position="after">
                     <field name="summary_qty_po"/>
                     <field name="count_line_product"/>
-                    <field name="payment_term_id" readonly="1"/>
+                    <field name="payment_term_id"/>
                 </field>
                 <field name="amount_total" position="after">
                     <field name="total_margin"/>
@@ -64,10 +65,14 @@
                     <field name="qty_onhand" readonly="1" optional="hide"/>
                     <field name="qty_incoming" readonly="1" optional="hide"/>
                     <field name="qty_outgoing" readonly="1" optional="hide"/>
+                    <field name="clean_website_description_product" readonly="1" optional="hide"/>
                     <field name="qty_available" readonly="1" optional="hide"/>
                     <field name="qty_reserved" readonly="1" optional="hide"/>
                     <field name="suggest" readonly="1" widget="badge" decoration-danger="suggest == 'harus beli'" decoration-success="suggest == 'masih cukup'"/>
-                    <!-- <field name="suggest" readonly="1"/> -->
+                <!-- <field name="suggest" readonly="1"/> -->
+                </field>
+                <field name="product_id" position="before">
+                    <field name="image_small" readonly="1" optional="hide" widget="image" height="50"/>
                 </field>
                 <field name="price_unit" position="after">
                     <field name="price_vendor" attrs="{'readonly': 1}" optional="hide"/>
diff --git a/indoteknik_custom/views/requisition.xml b/indoteknik_custom/views/requisition.xml
index 652d03d0..b704baaf 100644
--- a/indoteknik_custom/views/requisition.xml
+++ b/indoteknik_custom/views/requisition.xml
@@ -78,6 +78,7 @@
                                         <field name="partner_id" required="1" />
                                         <field name="qty_purchase" required="1" />
                                         <field name="price_unit" required="1" />
+                                        <field name="taxes_id" readonly="1" />
                                         <field name="subtotal" readonly="1" />
                                         <field name="brand_id" />
                                     </tree>
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index d77e09b8..6d02a86b 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -29,6 +29,15 @@
                 <field name="nama_wajib_pajak" position="attributes">
                     <attribute name="required">1</attribute>
                 </field>
+                <field name="kota_id" position="attributes">
+                    <attribute name="required">0</attribute>
+                </field>
+                <field name="kecamatan_id" position="attributes">
+                    <attribute name="required">0</attribute>
+                </field>
+                <field name="kelurahan_id" position="attributes">
+                    <attribute name="required">0</attribute>
+                </field>
                 <field name="npwp" position="attributes">
                     <attribute name="required">1</attribute>
                 </field>
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 17faaa95..98001589 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -72,6 +72,8 @@
                     <field name="flash_sale"/>
                     <field name="margin_after_delivery_purchase"/>
                     <field name="percent_margin_after_delivery_purchase"/>
+                    <field name="total_weight"/>
+                    <field name="pareto_status"/>
                 </field>
                 <field name="analytic_account_id" position="after">
                     <field name="customer_type" required="1"/>
@@ -80,6 +82,7 @@
                     <field name="email" required="1"/>
                     <field name="unreserve_id"/>
                     <field name="due_id" readonly="1"/>
+                    <field name="vendor_approval_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"
@@ -116,7 +119,8 @@
                     </attribute>
                 </xpath>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
-                    <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" domain="[('parent_id', '=', False)]"/>
+                    <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}" domain="[('parent_id', '=', False)]" options="{'no_create':True}"/>
+                    <field name="vendor_md_id" optional="hide"/>
                     <field name="purchase_price" attrs="
                         {
                             'readonly': [
@@ -126,13 +130,15 @@
                             ]
                         }
                     "/>
-                    <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]"/>
+                    <field name="purchase_price_md" optional="hide"/>
+                    <field name="purchase_tax_id" attrs="{'readonly': [('parent.approval_status', '!=', False)]}" domain="[('type_tax_use','=','purchase')]" options="{'no_create':True}"/>
                     <field name="item_percent_margin"/>
                     <field name="item_margin" optional="hide"/>
+                    <field name="margin_md" 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="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>
@@ -239,6 +245,7 @@
                     <field name="client_order_ref"/>
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
+                    <field name="pareto_status" optional="hide"/>
                 </field>
             </field>
         </record>
@@ -257,6 +264,7 @@
                     <field name="date_driver_arrival"/>
                     <field name="payment_type" optional="hide"/>
                     <field name="payment_status" optional="hide"/>
+                    <field name="pareto_status" optional="hide"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 899d29eb..d713edbc 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -16,6 +16,8 @@
                     <field name="driver_arrival_date" optional="hide"/>
                     <field name="note_logistic" optional="hide"/>
                     <field name="note" optional="hide"/>
+                    <field name="date_reserved" optional="hide"/>
+                    <field name="state_reserve" optional="hide"/>
                 </field>
                 <field name="partner_id" position="after">
                     <field name="purchase_representative_id"/>
@@ -91,6 +93,8 @@
                     <field name="status_printed"/>
                     <field name="printed_sj"/>
                     <field name="date_printed_sj"/>
+                    <field name="printed_sj_retur"/>
+                    <field name="date_printed_sj_retur"/>
                     <field name="date_printed_list"/>
                     <field name="is_internal_use"
                            string="Internal Use"
diff --git a/indoteknik_custom/views/user_company_request.xml b/indoteknik_custom/views/user_company_request.xml
index ad121a89..0600aa8e 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="create_date desc">
+            <tree create="1" default_order="create_date desc">
                 <field name="user_id"/>
                 <field name="user_company_id"/>
                 <field name="user_input"/>
@@ -30,7 +30,8 @@
                     <group>
                         <group>
                             <field name="user_id" readonly="1"/>
-                            <field name="user_company_id" readonly="1"/>
+                            <field name="similar_company_ids" invisible="1"/>
+                            <field name="user_company_id" domain="[('id', 'in', similar_company_ids)]"/>
                             <field name="user_input" readonly="1"/>
                             <field
                                 name="is_approve"
diff --git a/indoteknik_custom/views/vendor_approval.xml b/indoteknik_custom/views/vendor_approval.xml
new file mode 100644
index 00000000..605edfbf
--- /dev/null
+++ b/indoteknik_custom/views/vendor_approval.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <record id="vendor_approval_tree" model="ir.ui.view">
+            <field name="name">vendor.approval.tree</field>
+            <field name="model">vendor.approval</field>
+            <field name="arch" type="xml">
+                <tree default_order="create_date desc" create="0">
+                    <field name="number"/>
+                    <field name="create_date_so"/>
+                    <field name="order_id"/>
+                    <field name="partner_id"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="vendor_approval_line_tree" model="ir.ui.view">
+            <field name="name">vendor.approval.line.tree</field>
+            <field name="model">vendor.approval.line</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="product_id"/>
+                    <field name="sales_price"/>
+                    <field name="product_uom_qty"/>
+                    <field name="sales_tax_id"/>
+                    <field name="margin_after"/>
+                    <field name="vendor_id"/>
+                    <field name="vendor_md_id"/>
+                    <field name="purchase_price"/>
+                    <field name="purchase_price_md"/>
+                    <field name="margin_before"/>
+                    <field name="purchase_tax_id"/>
+                    <field name="percent_margin_difference"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="vendor_approval_form" model="ir.ui.view">
+            <field name="name">vendor.approval.form</field>
+            <field name="model">vendor.approval</field>
+            <field name="arch" type="xml">
+                <form create="false">
+                    <header>
+                        <button name="action_approve"
+                            string="Approve"
+                            type="object"
+                            attrs="{'invisible': [('state', 'not in', ['draft'])]}"
+                        />
+                        <button name="action_reject"
+                                string="Reject"
+                                type="object"
+                                attrs="{'invisible': [('state', 'not in', ['draft'])]}"
+                        />
+                    </header>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="partner_id" readonly="1"/>
+                                <field name="order_id" readonly="1"/>
+                                <field name="state" readonly="1"/>
+                                <field name="create_date_so" readonly="1"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="SO Line">
+                                <field name="vendor_approval_line" readonly="1"/>    
+                            </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="vendor_approval_view_search" model="ir.ui.view">
+            <field name="name">vendor.approval.search.view</field> <!-- Made the name more descriptive -->
+            <field name="model">vendor.approval</field>
+            <field name="arch" type="xml">
+                <search string="Search Vendor Approval">
+                    <field name="number"/>
+                    <field name="partner_id"/>
+                    <field name="order_id"/>
+                </search>
+            </field>
+        </record>    
+
+        <record id="vendor_approval_action" model="ir.actions.act_window">
+            <field name="name">Vendor Approval</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">vendor.approval</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="menu_vendor_approval"
+            name="Vendor Approval"
+            parent="sale.product_menu_catalog"
+            sequence="4"
+            action="vendor_approval_action"
+        />
+    </data>    
+</odoo>
diff --git a/indoteknik_custom/views/vit_kota.xml b/indoteknik_custom/views/vit_kota.xml
index 97c7e66c..58c97eb4 100755
--- a/indoteknik_custom/views/vit_kota.xml
+++ b/indoteknik_custom/views/vit_kota.xml
@@ -9,6 +9,7 @@
                 <field name="name"/>
                 <field name="jenis"/>
                 <field name="state_id"/>
+                <field name="is_jabodetabek"/>
             </tree>
         </field>
     </record>
@@ -28,6 +29,7 @@
                         <group>
                             <field name="jenis"/>
                             <field name="state_id"/>
+                            <field name="is_jabodetabek"/>
                         </group>
                         <group/>
                     </group>