From 815154df2e6d41d58c73a22b2edc82223ac79a4d Mon Sep 17 00:00:00 2001
From: Kirti Choudhary <kic@odoo.com>
Date: Tue, 7 Aug 2018 10:33:29 +0200
Subject: [PATCH] [IMP] various: clean product search views

Lots of modules are adding their search view for products
this commit tries to clean them in order to have something clearer
---
 addons/hr_expense/views/hr_expense_views.xml  |  1 +
 addons/mrp/views/mrp_production_views.xml     | 11 +++----
 addons/mrp/views/product_views.xml            | 30 ++++++++++++-------
 .../product/views/product_template_views.xml  |  1 +
 .../purchase/report/purchase_report_views.xml |  4 ++-
 addons/purchase/views/purchase_views.xml      |  3 +-
 .../report_all_channels_sales_views.xml       |  2 ++
 addons/sale/views/sale_views.xml              |  1 +
 addons/stock/views/product_views.xml          | 15 ++++++++++
 addons/website_sale/views/product_views.xml   |  1 +
 10 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index b09d265fa5b..4f3efb342b8 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -323,6 +323,7 @@
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
+            <field name="search_view_id" ref="product.product_search_form_view"/>
             <field name="context">{"default_can_be_expensed": 1, 'default_type': 'service'}</field>
             <field name="domain">[('can_be_expensed', '=', True)]</field>
             <field name="help" type="html">
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index 5687f10c605..63036ccb27e 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -260,6 +260,10 @@
                     <separator/>
                     <filter string="Late" domain="['&amp;', ('date_planned_start', '&lt;', current_date), ('state', '=', 'confirmed')]"
                         name="late" help="Production started late"/>
+                    <filter string="Done Last 365 Days" name="last_year_mo_order"
+                        domain="[('date_planned_start', '&gt;', (context_today() - relativedelta(days=365)).strftime('%Y-%m-%d'))]"/>
+                    <filter string="My Activities" name="activities_my"
+                        domain="[('activity_ids.user_id', '=', uid)]"/>
                     <separator/>
                     <filter string="No Routing" domain="[('routing_id','=', False)]" name="norouting" groups="mrp.group_mrp_routings"/>
                     <field name="product_id"/>
@@ -267,9 +271,6 @@
                     <field name="name" string="Work Center" filter_domain="[('routing_id.operation_ids.workcenter_id','ilike',self)]"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <separator/>
-                    <filter string="My Activities" name="activities_my"
-                        domain="[('activity_ids.user_id', '=', uid)]"/>
-                    <separator/>
                     <filter string="Late Activities" name="activities_overdue"
                         domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
                         help="Show all records which has next action date is before today"/>
@@ -281,8 +282,8 @@
                     <group expand="0" string="Group By...">
                         <filter string="Product" name="product" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Routing" name="routing" domain="[]" context="{'group_by':'routing_id'}" groups="mrp.group_mrp_routings"/>
-                        <filter string="Status" name="status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Scheduled Date" name="scheduled_month" domain="[]" context="{'group_by':'date_planned_start'}"/>
+                        <filter string="Scheduled Month" name="scheduled_month" domain="[]" context="{'group_by':'date_planned_start'}" help="Scheduled Date by Month"/>
+                        <filter string="Status" name="status" domain="[]" context="{'group_by': 'state'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/mrp/views/product_views.xml b/addons/mrp/views/product_views.xml
index 6439863312b..31d66394f92 100644
--- a/addons/mrp/views/product_views.xml
+++ b/addons/mrp/views/product_views.xml
@@ -15,39 +15,49 @@
                 </xpath>
             </field>
         </record>
-        <record id="product_template_search_view_procurment" model="ir.ui.view">
-             <field name="name">product.template.search.bom</field>
-             <field name="model">product.template</field>
-             <field name="inherit_id" ref="product.product_template_search_view"/>
-             <field name="arch" type="xml">
+
+        <record id="mrp_product_template_search_view" model="ir.ui.view">
+            <field name="name">mrp.product.template.search</field>
+            <field name="model">product.template</field>
+            <field name="mode">primary</field>
+            <field name="inherit_id" ref="product.product_template_search_view"/>
+            <field name="arch" type="xml">
                 <xpath expr="//filter[@name='consumable']" position="after">
                     <separator/>
                     <filter string="Manufactured Products" name="manufactured_products" domain="[('bom_ids', '!=', False)]"/>
                     <filter string="BoM Components" name="components" domain="[('bom_line_ids', '!=', False)]"/>
                 </xpath>
-             </field>
+            </field>
         </record>
-        <record id="view_mrp_product_product_form_inherited_view" model="ir.ui.view">
-            <field name="name">product.form.mrp.inherited</field>
+
+        <record id="mrp_product_product_search_view" model="ir.ui.view">
+            <field name="name">mrp.product.product.search</field>
             <field name="model">product.product</field>
+            <field name="mode">primary</field>
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//filter[@name='manufactured_products']" position="replace">
-                    <filter string="Manufactured Products" name="manufactured_products" domain="['|',('bom_ids.product_id','=', False),('variant_bom_ids','!=', False)]"/>
+                <xpath expr="//filter[@name='consumable']" position="after">
+                    <separator/>
+                    <filter string="Manufactured Products" name="manufactured_products" domain="[('bom_ids', '!=', False)]"/>
+                    <filter string="BoM Components" name="components" domain="[('bom_line_ids', '!=', False)]"/>
                 </xpath>
             </field>
         </record>
+
         <record id="product_template_action" model="ir.actions.act_window">
             <field name="name">Products</field>
             <field name="res_model">product.template</field>
             <field name="view_type">form</field>
+            <field name="search_view_id" ref="mrp_product_template_search_view"/>
             <field name="view_mode">kanban,tree,form</field>
             <field name="context">{"search_default_consumable": 1, 'default_type': 'product'}</field>
         </record>
+
         <menuitem id="menu_mrp_product_form"
             name="Products"
             action="product_template_action"
             parent="menu_mrp_bom" sequence="1"/>
+
         <menuitem id="product_variant_mrp" name="Product Variants"
             action="product.product_normal_action"
             parent="menu_mrp_bom" groups="product.group_product_variant" sequence="2"/>
diff --git a/addons/product/views/product_template_views.xml b/addons/product/views/product_template_views.xml
index abcfc5c8327..8aa451f6f55 100644
--- a/addons/product/views/product_template_views.xml
+++ b/addons/product/views/product_template_views.xml
@@ -107,6 +107,7 @@
         <field name="view_mode">kanban,tree,form</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="product_template_kanban_view"/>
+        <field name="search_view_id" ref="product.product_template_search_view"/>
         <field name="context">{"search_default_filter_to_sell":1}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
diff --git a/addons/purchase/report/purchase_report_views.xml b/addons/purchase/report/purchase_report_views.xml
index 5bc8256ee7b..ec9b5005212 100644
--- a/addons/purchase/report/purchase_report_views.xml
+++ b/addons/purchase/report/purchase_report_views.xml
@@ -56,6 +56,8 @@
             <search string="Purchase Orders">
                 <filter string="Quotations" name="quotes" domain="[('state','=','draft')]"/>
                 <filter string="Orders" name="orders" domain="[('state','!=','draft'),('state','!=','cancel')]"/>
+                <filter string="Purchased Last 365 Days" name="last_year_purchase"
+                        domain="[('date_order', '&gt;', (context_today() - relativedelta(days=365)).strftime('%Y-%m-%d'))]"/>
                 <field name="partner_id"/>
                 <field name="product_id"/>
                 <group expand="0" string="Extended Filters">
@@ -70,10 +72,10 @@
                     <filter string="Partner's Country" name="country_id" context="{'group_by':'country_id'}"/>
                     <filter string="Purchase Representative" name="user_id" context="{'group_by':'user_id'}"/>
                     <filter string="Product Category" name="group_category_id" context="{'group_by':'category_id'}"/>
+                    <filter string="Order Date" name="order_month" context="{'group_by': 'date_order:month'}"/>
                     <filter string="Status" name="status" context="{'group_by':'state'}"/>
                     <filter string="Company" name="company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator/>
-                    <filter string="Order Date" name="order_month" context="{'group_by':'date_order:month'}"/>
                     <filter string="Fiscal Position" name="fiscal_position" context="{'group_by':'fiscal_position_id'}" help="Purchase Order Fiscal Position"/>
                 </group>
             </search>
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index cbe5485d275..425fd472087 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -56,7 +56,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">kanban,tree,form</field>
         <field name="context">{"search_default_filter_to_purchase":1, "purchase_product_template": 1}</field>
-        <field name="search_view_id" eval="False"/> <!-- Force empty -->
+        <field name="search_view_id" ref="product.product_template_search_view"/>
         <field name="view_id" eval="False"/> <!-- Force empty -->
         <field name="help" type="html">
           <p class="o_view_nocontent_smiling_face">
@@ -77,6 +77,7 @@
             <field name="res_model">product.product</field>
             <field name="view_mode">tree,kanban,form</field>
             <field name="view_type">form</field>
+            <field name="search_view_id" ref="product.product_search_form_view"/>
             <field name="context">{"search_default_filter_to_purchase": 1}</field>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
diff --git a/addons/sale/report/report_all_channels_sales_views.xml b/addons/sale/report/report_all_channels_sales_views.xml
index a29bf412a6c..102a8993390 100644
--- a/addons/sale/report/report_all_channels_sales_views.xml
+++ b/addons/sale/report/report_all_channels_sales_views.xml
@@ -17,7 +17,9 @@
         <field name="arch" type="xml">
             <search string="Sales by Channel Analysis">
                 <field name="date_order"/>
+                <field name="product_id"/>
                 <filter string="Date" name="current_year" date="date_order" default_period="this_year"/>
+                <filter string="Last 365 Days" name="last_year" domain="[('date_order', '&gt;=', (context_today() - datetime.timedelta(days=365)).strftime('%Y-%m-%d'))]"/>
                 <group expand="1" string="Group By">
                     <filter string="Sales Team" name="team_id" context="{'group_by':'team_id'}"/>
                 </group>
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index e3688b3fe70..69f9eabf864 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -62,6 +62,7 @@
             <field name="view_mode">kanban,tree,form</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="product.product_template_kanban_view"/>
+            <field name="search_view_id" ref="product.product_template_search_view"/>
             <field name="context">{"search_default_filter_to_sell":1, "sale_multi_pricelist_product_template": 1}</field>
             <field name="help" type="html">
                 <p class="o_view_nocontent_smiling_face">
diff --git a/addons/stock/views/product_views.xml b/addons/stock/views/product_views.xml
index 04bf63cac3e..d89245c4a01 100644
--- a/addons/stock/views/product_views.xml
+++ b/addons/stock/views/product_views.xml
@@ -76,6 +76,20 @@
             </field>
         </record>
 
+        <record id="stock_product_search_form_view" model="ir.ui.view">
+            <field name="name">product.product.search.stock.form</field>
+            <field name="model">product.product</field>
+            <field name="mode">primary</field>
+            <field name="inherit_id" ref="product.product_search_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//filter[@name='inactive']" position="after">
+                    <separator/>
+                    <filter name="real_stock_available" string="Available Products" domain="[('qty_available','&gt;',0)]"/>
+                    <filter name="real_stock_negative" string="Negative Forecasted Quantity" domain="[('virtual_available','&lt;',0)]"/>
+                </xpath>
+            </field>
+        </record>
+
         <!-- view common to both template and product -->
         <record id="view_template_property_form" model="ir.ui.view">
             <field name="name">product.template.stock.property.form.inherit</field>
@@ -340,6 +354,7 @@
         <field name="res_model">product.template</field>
         <field name="view_mode">kanban,tree,form</field>
         <field name="view_type">form</field>
+        <field name="search_view_id" ref="product_template_search_form_view_stock"/>
         <field name="context">{"search_default_consumable": 1, 'default_type': 'product'}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
diff --git a/addons/website_sale/views/product_views.xml b/addons/website_sale/views/product_views.xml
index c3edd829154..706460b6454 100644
--- a/addons/website_sale/views/product_views.xml
+++ b/addons/website_sale/views/product_views.xml
@@ -17,6 +17,7 @@
         <field name="res_model">product.template</field>
         <field name="view_type">form</field>
         <field name="view_mode">kanban,tree,form</field>
+        <field name="search_view_id" ref="product_template_search_view_website"/>
         <field name="context">{'search_default_published': 1, 'default_website_published': True}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">