diff --git a/addons/google_drive/static/src/js/gdrive.js b/addons/google_drive/static/src/js/gdrive.js
index dbbe50d0794..98324c1c288 100644
--- a/addons/google_drive/static/src/js/gdrive.js
+++ b/addons/google_drive/static/src/js/gdrive.js
@@ -9,7 +9,7 @@ openerp.google_drive = function (instance, m) {
             this._super.apply(this, arguments);
             var view = self.getParent();
             var result;
-            if (view.fields_view.type == "form") {
+            if (view.fields_view && view.fields_view.type == "form") {
                 ids = []
                 view.on("load_record", self, function (r) {
                     ids = [r.id]
diff --git a/addons/im_livechat/report/im_livechat_report.xml b/addons/im_livechat/report/im_livechat_report.xml
index bc8d8df8694..dcf820405f5 100644
--- a/addons/im_livechat/report/im_livechat_report.xml
+++ b/addons/im_livechat/report/im_livechat_report.xml
@@ -2,15 +2,26 @@
 <openerp>
     <data>
 
+        <record model="ir.ui.view" id="view_livechat_support_session_pivot">
+            <field name="name">im_livechat.report.pivot</field>
+            <field name="model">im_livechat.report</field>
+            <field name="arch" type="xml">
+                <pivot string="Livechat Support Statistics" disable_linking="True">
+                    <field name="uuid" type="row"/>
+                    <field name="duration" type="measure"/>
+                    <field name="nbr_messages" type="measure"/>
+                    <field name="time_to_answer" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_livechat_support_session_graph">
             <field name="name">im_livechat.report.graph</field>
             <field name="model">im_livechat.report</field>
             <field name="arch" type="xml">
-                <graph string="Livechat Support Statistics" type="pivot">
-                    <field name="uuid" type="row"/>
-                    <field name="duration" type="measure"/>
+                <graph string="Livechat Support Statistics">
+                    <field name="uuid"/>
                     <field name="nbr_messages" type="measure"/>
-                    <field name="time_to_answer" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -42,8 +53,7 @@
             <field name="name">Livechat Support Report</field>
             <field name="res_model">im_livechat.report</field>
             <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_livechat_support_session_graph"></field>
+            <field name="view_mode">pivot,graph</field>
             <field name="help">Livechat Support Analysis allows you to easily check and analyse your company livechat session performance. Extract informations about the missed sessions, the audiance, the duration of a session, etc.</field>
         </record>
 
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 43a43c7e7ce..47b0e26e31b 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -2,13 +2,24 @@
 <openerp>
     <data>
 
+    <record id="view_report_campaign_analysis_pivot" model="ir.ui.view">
+        <field name="name">campaign.analysis.pivot</field>
+        <field name="model">campaign.analysis</field>
+        <field name="arch" type="xml">
+            <pivot string="Marketing Reports" disable_linking="True">
+                <field name="segment_id" type="row"/>
+                <field name="month" type="col"/>
+            </pivot>
+        </field>
+    </record>
+
     <record id="view_report_campaign_analysis_graph" model="ir.ui.view">
         <field name="name">campaign.analysis.graph</field>
         <field name="model">campaign.analysis</field>
         <field name="arch" type="xml">
-            <graph string="Marketing Reports" type="pivot" stacked="True">
-                <field name="segment_id" type="row"/>
-                <field name="month" type="col"/>
+            <graph string="Marketing Reports">
+                <field name="segment_id"/>
+                <field name="month"/>
             </graph>
         </field>
     </record>
@@ -66,7 +77,7 @@
         <field name="name">Campaign Analysis</field>
         <field name="res_model">campaign.analysis</field>
         <field name="view_type">form</field>
-        <field name="view_mode">graph,tree</field>
+        <field name="view_mode">pivot,graph,tree</field>
         <field name="context">{'group_by': [], 'group_by_no_leaf':1}</field>
         <field name="search_view_id" ref="view_campaign_analysis_search"/>
     </record>
diff --git a/addons/mass_mailing/views/mass_mailing_report.xml b/addons/mass_mailing/views/mass_mailing_report.xml
index e52a6f7e0a2..ba243273a20 100644
--- a/addons/mass_mailing/views/mass_mailing_report.xml
+++ b/addons/mass_mailing/views/mass_mailing_report.xml
@@ -2,17 +2,28 @@
 <openerp>
     <data>
 
-        <record id="view_mail_statistics_report_graph" model="ir.ui.view">
-            <field name="name">mail.statistics.report.graph</field>
+        <record id="view_mail_statistics_report_pivot" model="ir.ui.view">
+            <field name="name">mail.statistics.report.pivot</field>
             <field name="model">mail.statistics.report</field>
             <field name="arch" type="xml">
-                <graph string="Mass Mailing Statistics" type="pivot" stacked="True">
+                <pivot string="Mass Mailing Statistics" disable_linking="True">
                     <field name="campaign" type="row"/>
                     <field name="sent" type="measure"/>
                     <field name="delivered" type="measure"/>
                     <field name="opened" type="measure"/>
                     <field name="bounced" type="measure"/>
                     <field name="replied" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
+        <record id="view_mail_statistics_report_graph" model="ir.ui.view">
+            <field name="name">mail.statistics.report.graph</field>
+            <field name="model">mail.statistics.report</field>
+            <field name="arch" type="xml">
+                <graph string="Mass Mailing Statistics">
+                    <field name="campaign"/>
+                    <field name="sent" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -45,14 +56,9 @@
            <field name="name">Mass Mailing Analysis</field>
            <field name="res_model">mail.statistics.report</field>
            <field name="view_type">form</field>
-           <field name="view_mode">graph</field>
+           <field name="view_mode">pivot,graph</field>
            <field name="help">Mass Mailing Statistics allows you to check different mailing related information like number of bounced mails, opened mails, replied mails. You can sort out your analysis by different groups to get accurate grained analysis.</field>
        </record>
-       <record id="action_mail_mass_mailing_report_graph" model="ir.actions.act_window.view">
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_mail_statistics_report_graph"/>
-            <field name="act_window_id" ref="action_mail_statistics_report"/>
-       </record>
 
        <menuitem name="Mass Mailing Analysis" id="menu_mass_mailing_report" sequence="1"
             parent="base.marketing_reporting_menu" action="action_mail_statistics_report"/>
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index ca4f786e11c..b2b41c434fb 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -30,17 +30,29 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_report_membership_graph1">
-            <field name="name">report.membership.graph1</field>
+        <record model="ir.ui.view" id="view_report_membership_pivot">
+            <field name="name">report.membership.pivot</field>
             <field name="model">report.membership</field>
             <field name="arch" type="xml">
-                <graph string="Membership" type="pivot">
+                <pivot string="Membership" disable_linking="True">
                     <field name="membership_id" type="row"/>
                     <field name="start_date" interval="month" type="col"/>
                     <field name="quantity" type="measure"/>
                     <field name="num_paid" type="measure"/>
                     <field name="num_invoiced" type="measure"/>
                     <field name="tot_earned" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_report_membership_graph1">
+            <field name="name">report.membership.graph1</field>
+            <field name="model">report.membership</field>
+            <field name="arch" type="xml">
+                <graph string="Membership">
+                    <field name="membership_id" type="row"/>
+                    <field name="start_date" interval="month" type="col"/>
+                    <field name="quantity" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -49,7 +61,7 @@
             <field name="name">Members Analysis</field>
             <field name="res_model">report.membership</field>
             <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
+            <field name="view_mode">pivot,graph</field>
             <field name="search_view_id" ref="view_report_membership_search"/>
             <field name="context">{"search_default_start_date":1,"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1,'group_by_no_leaf':1}</field>
         </record>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 79ac6eb1321..3f01be4cbd0 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -641,14 +641,26 @@
         </record>
 
 
+        <record model="ir.ui.view" id="view_production_pivot">
+            <field name="name">mrp.production.pivot</field>
+            <field name="model">mrp.production</field>
+            <field name="arch" type="xml">
+                <pivot string="Manufacturing Orders">
+                    <field name="date_planned" type="row"/>
+                    <field name="hour_total" type="measure"/>
+                    <field name="cycle_total" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_production_graph">
             <field name="name">mrp.production.graph</field>
             <field name="model">mrp.production</field>
             <field name="arch" type="xml">
-                <graph string="Manufacturing Orders" type="bar">
+                <graph string="Manufacturing Orders">
                     <field name="date_planned"/>
-                    <field name="hour_total" operator="+"/>
-                    <field name="cycle_total" operator="+"/>
+                    <field name="hour_total" type="measure"/>
+                    <field name="cycle_total" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -858,7 +870,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph,gantt</field>
+            <field name="view_mode">tree,form,calendar,pivot,graph,gantt</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
             <field name="context">{}</field>
@@ -883,7 +895,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.production</field>
             <field name="view_type">form</field>
-            <field name="view_mode">calendar,tree,form,graph</field>
+            <field name="view_mode">calendar,tree,form,pivot,graph</field>
             <field name="domain">[('state','in',('ready','confirmed','in_production'))]</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index da41d9e2b18..6d86a544c06 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -4,16 +4,28 @@
         <!--
         Work Order Report
         -->
-        <record id="view_report_mrp_workorder_graph" model="ir.ui.view">
-            <field name="name">mrp.workorder.graph</field>
+        <record id="view_report_mrp_workorder_pivot" model="ir.ui.view">
+            <field name="name">mrp.workorder.pivot</field>
             <field name="model">mrp.workorder</field>
             <field name="arch" type="xml">
-                <graph string="Work Orders" type="pivot">
+                <pivot string="Work Orders" disable_linking="True">
                     <field name="workcenter_id" type="row"/>
                     <field name="date" interval="month" type="col"/>
                     <field name="product_qty" type="measure"/>
                     <field name="total_hours" type="measure"/>
                     <field name="total_cycles" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
+        <record id="view_report_mrp_workorder_graph" model="ir.ui.view">
+            <field name="name">mrp.workorder.graph</field>
+            <field name="model">mrp.workorder</field>
+            <field name="arch" type="xml">
+                <graph string="Work Orders">
+                    <field name="date" interval="month"/>
+                    <field name="workcenter_id"/>
+                    <field name="product_qty" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -66,17 +78,9 @@
             <field name="name">Work Order</field>
             <field name="res_model">mrp.workorder</field>
             <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_mrp_workorder_graph"/>
+            <field name="view_mode">pivot,graph</field>
             <field name="search_view_id" ref="view_report_mrp_workorder_filter"/>
-            <field name="context">{'search_default_Workcenter': 1,'group_by_no_leaf':1,'group_by':[]}</field>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_mrp_workorder_graph">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_mrp_workorder_graph"/>
-            <field name="act_window_id" ref="action_report_mrp_workorder"/>
+            <field name="context">{'search_default_Workcenter': 1}</field>
         </record>
 
         <menuitem name="Work Order Analysis" action="action_report_mrp_workorder" id="menu_report_mrp_workorders_tree" parent="mrp.next_id_77"/>
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index d2b4774c138..21eaafb28c6 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <record id="view_report_pos_order_pivot" model="ir.ui.view">
+            <field name="name">report.pos.order.pivot</field>
+            <field name="model">report.pos.order</field>
+            <field name="arch" type="xml">
+                <pivot string="Point of Sale Analysis">
+                    <field name="product_categ_id" type="row"/>
+                    <field name="date" interval="month" type="col"/>
+                    <field name="product_qty" type="measure"/>
+                    <field name="price_total" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
         <record id="view_report_pos_order_graph" model="ir.ui.view">
             <field name="name">report.pos.order.graph</field>
             <field name="model">report.pos.order</field>
             <field name="arch" type="xml">
-                <graph string="Point of Sale Analysis" type="pivot">
+                <graph string="Point of Sale Analysis">
                     <field name="product_categ_id" type="row"/>
-                    <field name="date" interval="month" type="col"/>
-                    <field name="product_qty" type="measure"/>
                     <field name="price_total" type="measure"/>
                 </graph>
             </field>
@@ -45,7 +56,7 @@
             <field name="name">Orders Analysis</field>
             <field name="res_model">report.pos.order</field>
             <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
+            <field name="view_mode">pivot,graph</field>
             <field name="search_view_id" ref="view_report_pos_order_search"/>
             <field name="context">{'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8ff9e63453d..6e391bd6a00 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -90,7 +90,7 @@
         <field name="name">On Draft Invoices</field>
         <field name="res_model">account.invoice</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,form,calendar,graph</field>
+        <field name="view_mode">tree,form,calendar,pivot,graph</field>
         <field eval="False" name="view_id"/>
         <field name="domain">[('type','=','in_invoice')]</field>
         <field name="context">{'default_type':'in_invoice', 'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
@@ -163,13 +163,23 @@
                 </calendar>
             </field>
         </record>
+        <record model="ir.ui.view" id="purchase_order_pivot">
+            <field name="name">purchase.order.pivot</field>
+            <field name="model">purchase.order</field>
+            <field name="arch" type="xml">
+                <pivot string="Purchase Order" display_quantity="True">
+                    <field name="partner_id" type="row"/>
+                    <field name="amount_total" type="measure"/>
+                </pivot>
+            </field>
+        </record>
         <record model="ir.ui.view" id="purchase_order_graph">
             <field name="name">purchase.order.graph</field>
             <field name="model">purchase.order</field>
             <field name="arch" type="xml">
-                <graph string="Purchase Order" type="bar">
+                <graph string="Purchase Order">
                     <field name="partner_id"/>
-                    <field name="amount_total" operator="+"/>
+                    <field name="amount_total" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -363,7 +373,7 @@
             <field name="res_model">purchase.order</field>
             <field name="context">{}</field>
             <field name="domain">[('state','in',('draft','sent','bid','cancel', 'confirmed'))]</field>
-            <field name="view_mode">tree,form,graph,calendar</field>
+            <field name="view_mode">tree,form,pivot,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
@@ -386,7 +396,7 @@
             <field name="name">Purchase Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
-            <field name="view_mode">tree,form,graph,calendar</field>
+            <field name="view_mode">tree,form,pivot,graph,calendar</field>
             <field name="context">{}</field>
             <field name="domain">[('state','not in',('draft','sent','bid', 'confirmed'))]</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index c60e3d62d2a..81444eca865 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="view_purchase_order_graph">
-            <field name="name">product.month.graph</field>
+        <record model="ir.ui.view" id="view_purchase_order_pivot">
+            <field name="name">product.month.pivot</field>
             <field name="model">purchase.report</field>
             <field name="arch" type="xml">
-                <graph string="Purchase Orders Statistics" type="pivot">
+                <pivot string="Purchase Orders Statistics" disable_linking="True">
                     <field name="partner_id" type="row"/>
                     <field name="date" interval="month" type="col"/>
                     <field name="price_total" type="measure"/>
                     <field name="quantity" type="measure"/>
                     <field name="price_average" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_purchase_order_graph">
+            <field name="name">product.month.graph</field>
+            <field name="model">purchase.report</field>
+            <field name="arch" type="xml">
+                <graph string="Purchase Orders Statistics">
+                    <field name="partner_id" type="row"/>
+                    <field name="date" interval="month" type="col"/>
+                    <field name="price_average" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -77,9 +88,8 @@
         <field name="name">Purchase Analysis</field>
         <field name="res_model">purchase.report</field>
         <field name="view_type">form</field>
-        <field name="view_mode">graph</field>
-        <field name="view_id" ref="view_purchase_order_graph"></field>
-        <field name="context">{'search_default_orders': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="view_mode">pivot,graph</field>
+        <field name="context">{'search_default_orders': 1}</field>
         <field name="help">Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your suppliers, etc.</field>
     </record>
 
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 92e8aaa8caf..708a4d32ff3 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -2,13 +2,24 @@
 <openerp>
 <data>
 
+    <record id="view_order_product_pivot" model="ir.ui.view">
+         <field name="name">sale.report.pivot</field>
+         <field name="model">sale.report</field>
+         <field name="arch" type="xml">
+             <pivot string="Sales Analysis" disable_linking="True">
+                 <field name="team_id" type="row"/>
+                 <field name="date" interval="month" type="col"/>
+                 <field name="price_total" type="measure"/>
+             </pivot>
+         </field>
+    </record>
+
     <record id="view_order_product_graph" model="ir.ui.view">
          <field name="name">sale.report.graph</field>
          <field name="model">sale.report</field>
          <field name="arch" type="xml">
-             <graph string="Sales Analysis" type="pivot" stacked="True">
+             <graph string="Sales Analysis">
                  <field name="team_id" type="row"/>
-                 <field name="date" interval="month" type="col"/>
                  <field name="price_total" type="measure"/>
              </graph>
          </field>
@@ -78,9 +89,8 @@
         <field name="name">Sales Analysis</field>
         <field name="res_model">sale.report</field>
         <field name="view_type">form</field>
-        <field name="view_mode">graph</field>
+        <field name="view_mode">pivot,graph</field>
         <field name="search_view_id" ref="view_order_product_search"/>
-        <field name="view_id" ref="view_order_product_graph"/>
         <field name="context">{'search_default_Sales':1, 'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="help">This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
     </record>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f48e56c53a1..47545de715c 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -34,12 +34,22 @@
             <field name="name">sale.order.graph</field>
             <field name="model">sale.order</field>
             <field name="arch" type="xml">
-                <graph string="Sales Orders" type="bar">
-                    <field name="partner_id" type="row"/>
+                <graph string="Sales Orders">
+                    <field name="partner_id"/>
                     <field name="amount_total" type="measure"/>
                 </graph>
             </field>
         </record>
+        <record model="ir.ui.view" id="view_sale_order_pivot">
+            <field name="name">sale.order.pivot</field>
+            <field name="model">sale.order</field>
+            <field name="arch" type="xml">
+                <pivot string="Sales Orders">
+                    <field name="partner_id" type="row"/>
+                    <field name="amount_total" type="measure"/>
+                </pivot>
+            </field>
+        </record>
 
         <record id="view_order_tree" model="ir.ui.view">
             <field name="name">sale.order.tree</field>
@@ -281,7 +291,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_mode">tree,form,calendar,pivot,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
             <field name="context">{}</field>
             <field name="domain">[('state', 'not in', ('draft', 'sent', 'cancel'))]</field>
@@ -326,7 +336,7 @@
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_quotation_tree"/>
-            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_mode">tree,form,calendar,pivot,graph</field>
             <field name="context">{}</field>
             <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 33f9c57873f..9447f35e613 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -911,12 +911,24 @@
             </field>
         </record>
 
+        <record id="view_move_pivot" model="ir.ui.view">
+            <field name="name">stock.move.pivot</field>
+            <field name="model">stock.move</field>
+            <field name="arch" type="xml">
+                <pivot string="Stock Moves Analysis">
+                    <field name="product_id" type="row"/>
+                    <field name="location_dest_id" groups="stock.group_locations" type="row"/>
+                    <field name="product_uom_qty" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
         <record id="view_move_graph" model="ir.ui.view">
             <field name="name">stock.move.graph</field>
             <field name="model">stock.move</field>
             <field name="arch" type="xml">
-                <graph string="Stock Moves Analysis" type="pivot">
-                    <field name="product_id" type="row"/>
+                <graph string="Stock Moves Analysis">
+                    <field name="product_id"/>
                     <field name="location_dest_id" groups="stock.group_locations" type="row"/>
                     <field name="product_uom_qty" type="measure"/>
                 </graph>
@@ -1170,11 +1182,18 @@
         <field name="act_window_id" ref="action_move_form2"/>
         </record>
 
+        <record model="ir.actions.act_window.view" id="action_stock_move_pivot_all">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">pivot</field>
+            <field name="view_id" ref="view_move_pivot"/>
+            <field name="act_window_id" ref="action_move_form2"/>
+        </record>
+
         <record model="ir.actions.act_window.view" id="action_stock_move_graph_all">
             <field name="sequence" eval="3"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="view_move_graph"/>
-        <field name="act_window_id" ref="action_move_form2"/>
+            <field name="act_window_id" ref="action_move_form2"/>
         </record>
 
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1" groups="stock.group_locations"/>
diff --git a/addons/stock_account/wizard/stock_valuation_history_view.xml b/addons/stock_account/wizard/stock_valuation_history_view.xml
index f01d1d5035e..5ca5fa4dc5d 100644
--- a/addons/stock_account/wizard/stock_valuation_history_view.xml
+++ b/addons/stock_account/wizard/stock_valuation_history_view.xml
@@ -32,7 +32,7 @@
             <field name="name">Stock Valuation</field>
             <field name="res_model">wizard.valuation.history</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">form</field>
             <field name="view_id" ref="view_wizard_valuation_history"/>
             <field name="target">new</field>
         </record>
@@ -54,15 +54,25 @@
            </tree>
         </field>
     </record>
+    <record id="view_stock_history_report_pivot" model="ir.ui.view">
+        <field name="name">stock.history.value.pivot</field>
+        <field name="model">stock.history</field>
+        <field name="arch" type="xml">
+            <pivot string="Stock Value At Date">
+                <field name="product_id" type="row"/>
+                <field name="location_id" type="row"/>
+                <field name="quantity" type="measure"/>
+            </pivot>
+        </field>
+    </record>
     <record id="view_stock_history_report_graph" model="ir.ui.view">
         <field name="name">stock.history.value.graph</field>
         <field name="model">stock.history</field>
         <field name="arch" type="xml">
-            <graph string="Stock Value At Date" type="pivot">
-                <field name="product_id" type="row"/>
-                <field name="inventory_value" type="measure"/>
+            <graph string="Stock Value At Date">
+                <field name="product_id"/>
+                <field name="location_id"/>
                 <field name="quantity" type="measure"/>
-                <field name="location_id" type="row"/>
             </graph>
         </field>
     </record>
@@ -91,7 +101,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d %H:%M:%S'))]</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">tree,pivot,graph</field>
     </record>
     <menuitem action="action_history_tree"
             id="menu_action_history_tree"
diff --git a/addons/survey/views/survey_result.xml b/addons/survey/views/survey_result.xml
index 51ff03ba455..74742eb16c9 100644
--- a/addons/survey/views/survey_result.xml
+++ b/addons/survey/views/survey_result.xml
@@ -3,10 +3,10 @@
 <data>
     <template id="assets_frontend_result" inherit_id="website.assets_frontend" name="Survey Results assets">
         <xpath expr="." position="inside">
-            <script src="/web_graph/static/lib/nvd3/d3.v3.js"></script>
-            <script src="/web_graph/static/lib/nvd3/nv.d3.js"></script>
+            <script src="/web/static/lib/nvd3/d3.v3.js"></script>
+            <script src="/web/static/lib/nvd3/nv.d3.js"></script>
             <script type="text/javascript" src="/survey/static/src/js/survey_result.js" />
-            <link href="/web_graph/static/src/css/nv.d3.css" rel="stylesheet" type="text/css"></link>
+            <link href="/web/static/lib/nvd3/nv.d3.css" rel="stylesheet" type="text/css"></link>
             <link href="/survey/static/src/css/survey_result.css" rel="stylesheet" type="text/css"></link>
         </xpath>
     </template>