From cd8f2123fca0c9a3940c79348045a2b5e80500a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Fri, 19 Dec 2014 13:42:57 +0100
Subject: [PATCH] [IMP] fleet: add pivot views next to graph views

The graph view has been splitted into pivot/graph view.  This commit add
a pivot view whenever a graph view was defined.
---
 addons/fleet/fleet_board_view.xml | 31 ++++++++++++++++++++++++++----
 addons/fleet/fleet_view.xml       | 32 +++++++++++++++++++++++++++----
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/addons/fleet/fleet_board_view.xml b/addons/fleet/fleet_board_view.xml
index e28b85bc15d..5d5859c17ac 100644
--- a/addons/fleet/fleet_board_view.xml
+++ b/addons/fleet/fleet_board_view.xml
@@ -4,9 +4,8 @@
     <record model="ir.actions.act_window" id="action_fleet_reporting_costs">
       <field name="name">Costs Analysis</field>
       <field name="res_model">fleet.vehicle.cost</field>
-      <field name="view_id" ref="fleet_vehicle_effective_costs_report"></field>
       <field name="view_type">form</field>
-      <field name="view_mode">graph</field>
+      <field name="view_mode">pivot,graph</field>
       <field name="context">{"search_default_parent_false" : True,}</field>
       <field name="help" type="html">
         <p>
@@ -19,13 +18,24 @@
         </p>
       </field>
     </record>
+    <record model="ir.actions.act_window.view" id="action_view_fleet_reporting_pivot">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">pivot</field>
+        <field name="view_id" ref="fleet_vehicle_effective_costs_report_pivot"/>
+        <field name="act_window_id" ref="action_fleet_reporting_costs"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_view_fleet_reporting_graph">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">graph</field>
+        <field name="view_id" ref="fleet_vehicle_effective_costs_report"/>
+        <field name="act_window_id" ref="action_fleet_reporting_costs"/>
+    </record>
 
     <record model="ir.actions.act_window" id="action_fleet_reporting_costs_non_effective">
       <field name="name">Indicative Costs Analysis</field>
       <field name="res_model">fleet.vehicle.cost</field>
-      <field name="view_id" ref="fleet_vehicle_indicative_costs_report"></field>
       <field name="view_type">form</field>
-      <field name="view_mode">graph</field>
+      <field name="view_mode">pivot,graph</field>
       <field name="context">{"search_default_parent_true" : True,}</field>
       <field name="help" type="html">
         <p>
@@ -38,6 +48,19 @@
         </p>
       </field>
     </record>
+    <record model="ir.actions.act_window.view" id="action_view_fleet_non_effective_pivot">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">pivot</field>
+        <field name="view_id" ref="fleet_vehicle_indicative_costs_report_pivot"/>
+        <field name="act_window_id" ref="action_fleet_reporting_costs_non_effective"/>
+    </record>
+    
+    <record model="ir.actions.act_window.view" id="action_view_fleet_non_effective_graph">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">graph</field>
+        <field name="view_id" ref="fleet_vehicle_indicative_costs_report"/>
+        <field name="act_window_id" ref="action_fleet_reporting_costs_non_effective"/>
+    </record>
     
     <menuitem name="Fleet" parent="base.menu_reporting" id="menu_fleet_reporting" sequence="90" groups="group_fleet_manager"/>
 
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 04cdb3f5491..350d168294f 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -891,24 +891,48 @@
             </field>
         </record>
 
-        <record model='ir.ui.view' id='fleet_vehicle_effective_costs_report'>
-            <field name="name">fleet.vehicle.cost.graph</field>
+        <record model='ir.ui.view' id='fleet_vehicle_effective_costs_report_pivot'>
+            <field name="name">fleet.vehicle.cost.pivot</field>
             <field name="model">fleet.vehicle.cost</field>
             <field name="arch" type="xml">
-                <graph string="Vehicles costs" type="pivot">
+                <pivot string="Vehicles costs">
                     <field name="vehicle_id" type="row"/>
                     <field name="cost_type" type="row"/>
                     <field name="date" interval="year" type="col"/>
                     <field name="amount" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
+        <record model='ir.ui.view' id='fleet_vehicle_effective_costs_report'>
+            <field name="name">fleet.vehicle.cost.graph</field>
+            <field name="model">fleet.vehicle.cost</field>
+            <field name="arch" type="xml">
+                <graph string="Vehicles costs">
+                    <field name="vehicle_id"/>
+                    <field name="date" interval="year"/>
+                    <field name="amount" type="measure"/>
                 </graph>
             </field>
         </record>
 
+        <record model='ir.ui.view' id='fleet_vehicle_indicative_costs_report_pivot'>
+            <field name="name">fleet.vehicle.cost.pivot</field>
+            <field name="model">fleet.vehicle.cost</field>
+            <field name="arch" type="xml">
+                <pivot string="Vehicles costs" >
+                    <field name="vehicle_id" type="row"/>
+                    <field name="cost_type" type="col"/>
+                    <field name="amount" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
         <record model='ir.ui.view' id='fleet_vehicle_indicative_costs_report'>
             <field name="name">fleet.vehicle.cost.graph</field>
             <field name="model">fleet.vehicle.cost</field>
             <field name="arch" type="xml">
-                <graph string="Vehicles costs" type="pivot">
+                <graph string="Vehicles costs">
                     <field name="parent_id" type="row"/>
                     <field name="cost_type" type="col"/>
                     <field name="amount" type="measure"/>