From aaa3ead6860b58d8ef61a9055a969c0ed8c2ea2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Voet=20=28ryv=29?= <ryv@odoo.com>
Date: Mon, 3 Feb 2020 09:29:25 +0000
Subject: [PATCH] [REF] stock_account: merge/clean views of
 stock.valuation.layer

The views of stock.valuation.layer model
were in the wrong file,
move it, and merge duplicate search views. Also
remove the unused action 'action_stock_inventory_valuation'.

task-2123752
---
 .../views/stock_account_views.xml             | 26 ----------------
 .../views/stock_valuation_layer_views.xml     | 31 ++++++++++++-------
 2 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/addons/stock_account/views/stock_account_views.xml b/addons/stock_account/views/stock_account_views.xml
index 5f1ac2efc59..62c8cdc5f86 100644
--- a/addons/stock_account/views/stock_account_views.xml
+++ b/addons/stock_account/views/stock_account_views.xml
@@ -66,31 +66,5 @@
             </field>
         </record>
 
-        <record id="view_inventory_valuation_search" model="ir.ui.view">
-            <field name="name">Inventory Valuation</field>
-            <field name="model">stock.valuation.layer</field>
-            <field name="priority" eval="17"/>
-            <field name="arch" type="xml">
-                <search string="Inventory Valuation">
-                    <field name="product_id"/>
-                    <field name="categ_id" />
-                    <field name="product_tmpl_id" />
-                    <separator/>
-                    <group expand='0' string='Group by...'>
-                        <filter string='Product' name="group_by_product_id" context="{'group_by': 'product_id'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_stock_inventory_valuation" model="ir.actions.act_window">
-            <field name="name">Inventory Valuation</field>
-            <field name="res_model">stock.valuation.layer</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_group_by_product_id': 1}</field>
-            <field name="search_view_id" ref="view_inventory_valuation_search"/>
-        </record>
-        <menuitem id="menu_valuation" name="Inventory Valuation" parent="stock.menu_warehouse_report" sequence="110" action="action_stock_inventory_valuation"/>
-
     </data>
 </odoo>
diff --git a/addons/stock_account/views/stock_valuation_layer_views.xml b/addons/stock_account/views/stock_valuation_layer_views.xml
index b6ffe68fba9..a89aac82267 100644
--- a/addons/stock_account/views/stock_valuation_layer_views.xml
+++ b/addons/stock_account/views/stock_valuation_layer_views.xml
@@ -54,17 +54,6 @@
         </field>
     </record>
 
-    <record id="stock_valuation_layer_search" model="ir.ui.view">
-        <field name="name">stock.valuation.layer.search</field>
-        <field name="model">stock.valuation.layer</field>
-        <field name="arch" type="xml">
-            <search string="Valuation Layer?">
-                <field name="product_id"/>
-                <filter string="Product" name="group_by_product_id" context="{'group_by':'product_id'}"/>
-            </search>
-        </field>
-    </record>
-
     <record id="stock_valuation_layer_action" model="ir.actions.act_window">
         <field name="name">Stock Valuation</field>
         <field name="type">ir.actions.act_window</field>
@@ -80,6 +69,25 @@
         </field>
     </record>
 
+    <record id="view_inventory_valuation_search" model="ir.ui.view">
+        <field name="name">Inventory Valuation</field>
+        <field name="model">stock.valuation.layer</field>
+        <field name="arch" type="xml">
+            <search string="Inventory Valuation">
+                <field name="product_id"/>
+                <field name="categ_id" />
+                <field name="product_tmpl_id" />
+                <separator/>
+                <filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
+                <group expand='0' string='Group by...'>
+                    <filter string='Product' name="group_by_product_id" context="{'group_by': 'product_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <menuitem id="menu_valuation" name="Inventory Valuation" parent="stock.menu_warehouse_report" sequence="110" action="stock_valuation_layer_action"/>
+
     <record id="stock_valuation_layer_picking" model="ir.ui.view">
         <field name="name">stock.valuation.layer.picking</field>
         <field name="model">stock.picking</field>
@@ -93,4 +101,5 @@
             </xpath>
         </field>
     </record>
+    
 </odoo>