Merge branch 'release' into staging

11 files changed, 439 insertions, 4 deletions

diff --git a/indoteknik_custom/views/customer_review.xml b/indoteknik_custom/views/customer_review.xml
new file mode 100644
index 00000000..7d7e66df
--- /dev/null
+++ b/indoteknik_custom/views/customer_review.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="customer_review_action" model="ir.actions.act_window">
+            <field name="name">Customer Review</field>
+            <field name="res_model">customer.review</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <record id="customer_review_tree" model="ir.ui.view">
+            <field name="name">Customer Review</field>
+            <field name="model">customer.review</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="sequence"/>
+                    <field name="customer_name"/>
+                    <field name="ulasan"/>
+                    <field name="name"/>
+                    <field name="jabatan"/>
+                    <field name="status"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="customer_review_form" model="ir.ui.view">
+            <field name="name">Customer Review</field>
+            <field name="model">customer.review</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="sequence"/>
+                                <field name="image"/>
+                                <field name="customer_name"/>
+                                <field name="ulasan"/>
+                                <field name="name"/>
+                                <field name="jabatan"/>
+                                <field name="status"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <menuitem
+                id="customer_review"
+                name="Customer Review"
+                parent="website_sale.menu_orders"
+                sequence="2"
+                action="customer_review_action"
+        />
+    </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 b9b6ba0b..5fcb8b05 100755
--- a/indoteknik_custom/views/product_template.xml
+++ b/indoteknik_custom/views/product_template.xml
@@ -46,13 +46,30 @@
             <field name="inherit_id" ref="website_sale.product_template_form_view"/>
             <field name="arch" type="xml">
                 <field name="website_ribbon_id" position="after">
-                    <field name="last_calculate_rating" attrs="{'readonly': [('type', '=', 'product')]}"/>
-                    <field name="product_rating"/>
+                    <field name="maker_code"/>
+                    <field name="maker_name"/>
+                    <field name="origin"/>
+                    <field name="features"/>
+                    <field name="usage"/>
+                    <field name="specification"/>
+                    <field name="material"/>
                     <field name="search_rank"/>
-                    <field name="web_price_sorting" attrs="{'readonly': [('type', '=', 'product')]}"/>
                     <field name="solr_flag"/>
                 </field>
             </field>
         </record>
+        <record id="product_variant_indoteknik" model="ir.ui.view">
+            <field name="name">Product Product</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_variant_easy_edit_view"/>
+            <field name="arch" type="xml">
+                <field name="accurate_item_code" position="after">
+                    <field name="features"/>
+                    <field name="usage"/>
+                    <field name="specification"/>
+                    <field name="material"/>
+                </field>
+            </field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index fcd38677..c4a06a6c 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -71,7 +71,6 @@
             <field name="inherit_id" ref="purchase.purchase_order_view_tree"/>
             <field name="arch" type="xml">
                 <field name="invoice_status" position="after">
-                    <field name="procurement_status" />
                     <field name="po_status" />
                 </field>
             </field>
diff --git a/indoteknik_custom/views/purchase_outstanding.xml b/indoteknik_custom/views/purchase_outstanding.xml
new file mode 100644
index 00000000..dc203744
--- /dev/null
+++ b/indoteknik_custom/views/purchase_outstanding.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="purchase_outstanding_tree" model="ir.ui.view">
+        <field name="name">purchase.outstanding.tree</field>
+        <field name="model">purchase.outstanding</field>
+        <field name="arch" type="xml">
+            <tree create="false">
+                <field name="order_id"/>
+                <field name="partner_id"/>
+                <field name="user_id"/>
+                <field name="date_order"/>
+                <field name="po_state"/>
+                <field name="po_status"/>
+                <field name="product_id"/>
+                <field name="product_uom_qty"/>
+                <field name="qty_received"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="purchase_outstanding_form" model="ir.ui.view">
+        <field name="name">purchase.outstanding.form</field>
+        <field name="model">purchase.outstanding</field>
+        <field name="arch" type="xml">
+            <form create="false" edit="false">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="order_id"/>
+                            <field name="partner_id"/>
+                            <field name="user_id"/>
+                            <field name="date_order"/>
+                            <field name="po_state"/>
+                            <field name="po_status"/>
+                            <field name="product_id"/>
+                        </group>
+                        <group>
+                            <field name="product_uom_qty"/>
+                            <field name="qty_received"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_purchase_outstanding_filter" model="ir.ui.view">
+            <field name="name">purchase.outstanding.list.select</field>
+            <field name="model">purchase.outstanding</field>
+            <field name="priority" eval="15"/>
+            <field name="arch" type="xml">
+                <search string="Search Purchase Outstanding">
+                    <field name="order_id"/>
+                    <field name="product_id"/>
+               </search>
+            </field>
+        </record>
+
+    <record id="purchase_outstanding_action" model="ir.actions.act_window">
+        <field name="name">Purchase Outstanding</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">purchase.outstanding</field>
+        <field name="search_view_id" ref="view_purchase_outstanding_filter"/>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            id="menu_purchase_outstanding"
+            name="Purchase Outstanding"
+            parent="purchase.menu_purchase_products"
+            sequence="4"
+            action="purchase_outstanding_action"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index ea0cc569..9dfd9805 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -57,6 +57,19 @@
                 <field name="effective_date" position="after">
                     <field name="carrier_id"/>
                 </field>
+
+                <page name="customer_signature" position="after">
+                    <page string="Customer PO" name="customer_purchase_order">
+                        <group>
+                            <group>
+                                <field name="partner_purchase_order_name" readonly="True"/>
+                                <field name="partner_purchase_order_description" readonly="True"/>
+                                <field name="partner_purchase_order_file" readonly="True"/>
+                            </group>
+                        </group>
+                    </page>
+                </page>
+
             </field>
         </record>
     </data>
@@ -72,5 +85,17 @@
                 </field>
             </field>
         </record>
+        <record id="sales_order_tree_view_inherit" model="ir.ui.view">
+            <field name="name">Sale Order</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_tree"/>
+            <field name="arch" type="xml">
+                <field name="state" position="after">
+                    <field name="approval_status" />
+                    <field name="client_order_ref"/>
+                    <field name="so_status"/>
+                </field>
+            </field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/sales_outstanding.xml b/indoteknik_custom/views/sales_outstanding.xml
new file mode 100644
index 00000000..44c2603d
--- /dev/null
+++ b/indoteknik_custom/views/sales_outstanding.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="sales_outstanding_tree" model="ir.ui.view">
+        <field name="name">sales.outstanding.tree</field>
+        <field name="model">sales.outstanding</field>
+        <field name="arch" type="xml">
+            <tree create="false">
+                <field name="order_id"/>
+                <field name="partner_id"/>
+                <field name="user_id"/>
+                <field name="date_order"/>
+                <field name="so_state"/>
+                <field name="so_status"/>
+                <field name="product_id"/>
+                <field name="product_uom_qty"/>
+                <field name="qty_delivered"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sales_outstanding_form" model="ir.ui.view">
+        <field name="name">sales.outstanding.form</field>
+        <field name="model">sales.outstanding</field>
+        <field name="arch" type="xml">
+            <form create="false" edit="false">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="order_id"/>
+                            <field name="partner_id"/>
+                            <field name="user_id"/>
+                            <field name="date_order"/>
+                            <field name="so_state"/>
+                            <field name="so_status"/>
+                            <field name="product_id"/>
+                        </group>
+                        <group>
+                            <field name="product_uom_qty"/>
+                            <field name="qty_delivered"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_sales_outstanding_filter" model="ir.ui.view">
+            <field name="name">sales.outstanding.list.select</field>
+            <field name="model">sales.outstanding</field>
+            <field name="priority" eval="15"/>
+            <field name="arch" type="xml">
+                <search string="Search Sales Outstanding">
+                    <field name="order_id"/>
+                    <field name="product_id"/>
+               </search>
+            </field>
+        </record>
+
+    <record id="sales_outstanding_action" model="ir.actions.act_window">
+        <field name="name">Sales Outstanding</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sales.outstanding</field>
+        <field name="search_view_id" ref="view_sales_outstanding_filter"/>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            id="menu_sales_outstanding"
+            name="Sales Outstanding"
+            parent="purchase.menu_purchase_products"
+            sequence="5"
+            action="sales_outstanding_action"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/sales_target.xml b/indoteknik_custom/views/sales_target.xml
new file mode 100644
index 00000000..6ccea260
--- /dev/null
+++ b/indoteknik_custom/views/sales_target.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="sales_target_action" model="ir.actions.act_window">
+            <field name="name">Sales Target</field>
+            <field name="res_model">sales.target</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <record id="sales_target_tree" model="ir.ui.view">
+            <field name="name">Sales Target</field>
+            <field name="model">sales.target</field>
+            <field name="arch" type="xml">
+                <tree>
+                    <field name="partner_id"/>
+                    <field name="period"/>
+                    <field name="omset_last_year"/>
+                    <field name="ongoing_omset_total"/>
+                    <field name="target"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="sales_target_form" model="ir.ui.view">
+            <field name="name">Sales Target</field>
+            <field name="model">sales.target</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="partner_id"/>
+                                <field name="period"/>
+                                <field name="omset_last_year"/>
+                                <field name="ongoing_omset_odoo"/>
+                                <field name="ongoing_omset_accurate"/>
+                                <field name="ongoing_omset_adempiere"/>
+                                <field name="target"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        <menuitem
+                id="sale_target_menu"
+                action="sales_target_action"
+                parent="sale.menu_sales_config"
+                sequence="2"
+                name="Sales Target"
+        />
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index ce70fdd8..49e594b1 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
+        <record id="stock_picking_tree_view_inherit" model="ir.ui.view">
+            <field name="name">Stock Picking</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.vpicktree"/>
+            <field name="arch" type="xml">
+                <field name="json_popover" position="after">
+                    <field name="date_done"/>
+                    <field name="driver_departure_date"/>
+                    <field name="driver_arrival_date"/>
+                </field>
+            </field>
+        </record>
+
         <record id="stock_picking_form_view_inherit" model="ir.ui.view">
             <field name="name">Stock Picking</field>
             <field name="model">stock.picking</field>
diff --git a/indoteknik_custom/views/website_content.xml b/indoteknik_custom/views/website_content.xml
new file mode 100644
index 00000000..e071134d
--- /dev/null
+++ b/indoteknik_custom/views/website_content.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="website_content_tree" model="ir.ui.view">
+        <field name="name">website.content.tree</field>
+        <field name="model">website.content</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="channel_id"/>
+                <field name="sequence"/>
+                <field name="slide_type"/>
+                <field name="name"/>
+                <field name="url"/>
+                <field name="status"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="website_content_form" model="ir.ui.view">
+        <field name="name">website.content.form</field>
+        <field name="model">website.content</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="channel_id"/>
+                            <field name="sequence"/>
+                            <field name="slide_type"/>
+                            <field name="name"/>
+                            <field name="url"/>
+                            <field name="status"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_website_content_filter" model="ir.ui.view">
+            <field name="name">website.content.list.select</field>
+            <field name="model">website.content</field>
+            <field name="priority" eval="15"/>
+            <field name="arch" type="xml">
+                <search string="Search Content">
+                    <field name="name"/>
+               </search>
+            </field>
+        </record>
+
+    <record id="website_content_action" model="ir.actions.act_window">
+        <field name="name">Website Content</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">website.content</field>
+        <field name="search_view_id" ref="view_website_content_filter"/>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            id="menu_website_content"
+            name="Website Content"
+            parent="website_sale.menu_orders"
+            sequence="3"
+            action="website_content_action"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/website_content_channel.xml b/indoteknik_custom/views/website_content_channel.xml
new file mode 100644
index 00000000..d1bc23fc
--- /dev/null
+++ b/indoteknik_custom/views/website_content_channel.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="website_content_channel_tree" model="ir.ui.view">
+        <field name="name">website.content.channel.tree</field>
+        <field name="model">website.content.channel</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+                <field name="visibility"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="website_content_channel_form" model="ir.ui.view">
+        <field name="name">website.content.channel.form</field>
+        <field name="model">website.content.channel</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="description_html"/>
+                            <field name="visibility"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_website_content_channel_filter" model="ir.ui.view">
+            <field name="name">website.content.channel.list.select</field>
+            <field name="model">website.content.channel</field>
+            <field name="priority" eval="15"/>
+            <field name="arch" type="xml">
+                <search string="Search Channel">
+                    <field name="name"/>
+               </search>
+            </field>
+        </record>
+
+    <record id="website_content_channel_action" model="ir.actions.act_window">
+        <field name="name">Website Content Channel</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">website.content.channel</field>
+        <field name="search_view_id" ref="view_website_content_channel_filter"/>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+            id="menu_website_content_channel"
+            name="Website Content Channel"
+            parent="website_sale.menu_orders"
+            sequence="2"
+            action="website_content_channel_action"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index e7e1b85d..d122c6c1 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -22,6 +22,7 @@
                     <field name="x_short_desc"/>
                     <field name="x_manufacture_level"/>
                     <field name="x_manufacture_service_center"/>
+                    <field name="cache_reset_status"/>
                 </tree>
             </field>
         </record>
@@ -40,6 +41,7 @@
                                 <field name="x_short_desc"/>
                                 <field name="x_manufacture_level"/>
                                 <field name="x_produk_aksesoris_sparepart"/>
+                                <field name="cache_reset_status"/>
                             </group>
                             <group>
                                 <field name="x_logo_manufacture" widget="image"/>