diff --git a/stock_analysis/__openerp__.py b/stock_analysis/__manifest__.py
similarity index 95%
rename from stock_analysis/__openerp__.py
rename to stock_analysis/__manifest__.py
index 4727098..a419fce 100644
--- a/stock_analysis/__openerp__.py
+++ b/stock_analysis/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Stock Analysis",
     "summary": "Analysis view for stock",
-    "version": "8.0.1.0.0",
+    "version": "10.0.1.0.0",
     "category": "Inventory, Logistic, Storage",
     "website": "https://www.agilebg.com",
     "author": "Agile Business Group, Odoo Community Association (OCA)",
diff --git a/stock_analysis/images/demo_analysis.png b/stock_analysis/images/demo_analysis.png
index 30bd05c..a4de27b 100644
Binary files a/stock_analysis/images/demo_analysis.png and b/stock_analysis/images/demo_analysis.png differ
diff --git a/stock_analysis/report/stock_analysis.py b/stock_analysis/report/stock_analysis.py
index 6e1cfa2..1304a18 100644
--- a/stock_analysis/report/stock_analysis.py
+++ b/stock_analysis/report/stock_analysis.py
@@ -2,8 +2,8 @@
 # © 2016 Lorenzo Battistini - Agile Business Group
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import tools
-from openerp import models, fields
+from odoo import tools
+from odoo import models, fields, api
 
 
 class StockAnalysis(models.Model):
@@ -26,9 +26,10 @@ class StockAnalysis(models.Model):
     company_id = fields.Many2one(
         'res.company', string='Company', readonly=True)
 
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, self._table)
-        cr.execute(
+    @api.model_cr
+    def init(self):
+        tools.drop_view_if_exists(self.env.cr, self._table)
+        self.env.cr.execute(
             """CREATE or REPLACE VIEW %s as (
             SELECT
                 quant.id AS id,
diff --git a/stock_analysis/report/stock_analysis_view.xml b/stock_analysis/report/stock_analysis_view.xml
index 74503a5..09a3482 100644
--- a/stock_analysis/report/stock_analysis_view.xml
+++ b/stock_analysis/report/stock_analysis_view.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 
-    <record id="stock_analysis_graph" model="ir.ui.view">
-         <field name="name">stock.analysis.graph</field>
+    <record id="stock_analysis_pivot" model="ir.ui.view">
+         <field name="name">stock.analysis.pivot</field>
          <field name="model">stock.analysis</field>
          <field name="arch" type="xml">
-             <graph string="Stock Analysis" type="pivot" stacked="True">
+            <pivot string="Stock Analysis" disable_linking="True">
                  <field name="product_id" type="row"/>
                  <field name="location_id" type="col"/>
                  <field name="qty" type="measure"/>
-             </graph>
+             </pivot>
          </field>
     </record>
 
-    <record id="stock_analysis_graph_search" model="ir.ui.view">
+    <record id="stock_analysis_pivot_search" model="ir.ui.view">
         <field name="name">stock.analysis.search</field>
         <field name="model">stock.analysis</field>
         <field name="arch" type="xml">
@@ -42,17 +41,16 @@
         </field>
     </record>
 
-    <record id="action_stock_analysis_graph" model="ir.actions.act_window">
+    <record id="action_stock_analysis_pivot" model="ir.actions.act_window">
         <field name="name">Stock Analysis</field>
         <field name="res_model">stock.analysis</field>
         <field name="view_type">form</field>
-        <field name="view_mode">graph</field>
-        <field name="search_view_id" ref="stock_analysis_graph_search"/>
-        <field name="view_id" ref="stock_analysis_graph"/>
+        <field name="view_mode">pivot,graph</field>
+        <field name="search_view_id" ref="stock_analysis_pivot_search"/>
+        <field name="view_id" ref="stock_analysis_pivot"/>
         <field name="context">{'search_default_internal_location':1}</field>
     </record>
 
-    <menuitem action="action_stock_analysis_graph" id="menu_action_stock_analysis_graph" parent="stock.next_id_61"/>
+    <menuitem action="action_stock_analysis_pivot" id="menu_action_stock_analysis_pivot" parent="stock.menu_warehouse_report"/>
 
-</data>
-</openerp>
+</odoo>