From 928ebb5fe1f3921460b1ddfddc8a9a1876cd9106 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:46 +0100
Subject: [PATCH] [IMP] event: 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/event/event_view.xml                   | 16 +++++++++--
 .../report/report_event_registration_view.xml | 28 +++++++++++--------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 5cecfb3a6bc..b7ca6167362 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -338,12 +338,22 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="view_event_registration_pivot">
+            <field name="name">event.registration.pivot</field>
+            <field name="model">event.registration</field>
+            <field name="arch" type="xml">
+                <pivot string="Registration" display_quantity="True">
+                    <field name="event_id" type="row"/>
+                </pivot>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_event_registration_graph">
             <field name="name">event.registration.graph</field>
             <field name="model">event.registration</field>
             <field name="arch" type="xml">
-                <graph string="Registration" type="bar">
-                    <field name="event_id" type="row"/>
+                <graph string="Registration">
+                    <field name="event_id"/>
                 </graph>
             </field>
         </record>
@@ -376,7 +386,7 @@
           <field name="res_model">event.registration</field>
           <field name="view_type">form</field>
           <field name="domain"></field>
-          <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="search_view_id" ref="view_registration_search"/>
         </record>
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 6fff896edec..16e9fbef562 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -2,13 +2,25 @@
 <openerp>
     <data>
 
+        <record model ="ir.ui.view" id="report_event_registration_pivot">
+            <field name="name">report.event.registration.pivot</field>
+            <field name="model">report.event.registration</field>
+            <field name="arch" type="xml">
+                <pivot string="Event on Registration" disable_linking="True">
+                    <field name="event_type" type="row"/>
+                    <field name="event_date" interval="month" type="col"/>
+                    <field name="confirm_state" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
         <record model ="ir.ui.view" id="report_event_registration_graph">
             <field name="name">report.event.registration.graph</field>
             <field name="model">report.event.registration</field>
             <field name="arch" type="xml">
-                <graph string="Event on Registration"  type="pivot" >
-                    <field name="event_type" type="row"/>
-                    <field name="event_date" interval="month" type="col"/>
+                <graph string="Event on Registration">
+                    <field name="event_type"/>
+                    <field name="event_date" interval="month"/>
                     <field name="confirm_state" type="measure"/>
                 </graph>
             </field>
@@ -47,16 +59,8 @@
             <field name="name">Events Analysis</field>
             <field name="res_model">report.event.registration</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_event_registration_search"/>
-            <field name="context">{"group_by_no_leaf":1, "group_by":[]}</field>
-        </record>
-
-        <record model="ir.actions.act_window.view" id="action_report_event_registration_graph">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="report_event_registration_graph"/>
-            <field name="act_window_id" ref="action_report_event_registration"/>
         </record>
 
         <menuitem parent="base.menu_reporting" id="menu_reporting_events" sequence="50" groups="event.group_event_manager" name="Events"/>