diff --git a/addons/stock_account/views/product_views.xml b/addons/stock_account/views/product_views.xml
index f5a127c0c1c..dad42d09084 100644
--- a/addons/stock_account/views/product_views.xml
+++ b/addons/stock_account/views/product_views.xml
@@ -58,6 +58,8 @@
                     <field name="avg_cost" string="Unit Cost" optional="show" widget='monetary' options="{'currency_field': 'company_currency_id'}"/>
                     <field name="total_value" string="Total Value" optional="show" widget='monetary' options="{'currency_field': 'company_currency_id'}" sum="Total Value"/>
                     <button name="%(stock_valuation_layer_action)d" title="Valuation Report" type="action" class="btn-link"
+                        icon="fa-bar-chart" context="{'search_default_product_id': id, 'default_product_id': id}"  attrs="{'invisible': [('cost_method', '!=', 'average')]}"/>
+                    <button name="%(stock_valuation_layer_report_action)d" title="Valuation Report" type="action" class="btn-link"
                         icon="fa-bar-chart" context="{'search_default_product_id': id, 'default_product_id': id}"  attrs="{'invisible': [('cost_method', '!=', 'fifo')]}"/>
                 </field>
             </field>
diff --git a/addons/stock_account/views/stock_valuation_layer_views.xml b/addons/stock_account/views/stock_valuation_layer_views.xml
index e39dc05d10d..fd2a6d4c18e 100644
--- a/addons/stock_account/views/stock_valuation_layer_views.xml
+++ b/addons/stock_account/views/stock_valuation_layer_views.xml
@@ -121,7 +121,7 @@
             <field name="unit_cost" position="after">
                 <field name="remaining_qty" sum="Total Remaining Quantity"/>
             </field>
-            <field name="value" position="replace">
+            <field name="value" position="before">
                 <field name="remaining_value" sum="Total Remaining Value"/>
             </field>
         </field>
@@ -143,7 +143,7 @@
         </field>
     </record>
 
-    <menuitem id="menu_valuation" name="Valuation" parent="stock.menu_warehouse_report" sequence="250" action="stock_valuation_layer_report_action" groups="base.group_no_one"/>
+    <menuitem id="menu_valuation" name="Valuation" parent="stock.menu_warehouse_report" sequence="250" action="stock_valuation_layer_action" groups="base.group_no_one"/>
 
     <record id="stock_valuation_layer_picking" model="ir.ui.view">
         <field name="name">stock.valuation.layer.picking</field>
@@ -158,5 +158,5 @@
             </xpath>
         </field>
     </record>
-    
+
 </odoo>