[IMP] hr: 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.

8 files changed, 136 insertions, 29 deletions

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 66e4caab61a..6ae54ddd373 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -65,14 +65,26 @@
             </field>
         </record>
 
-        <record id="view_hr_attendance_graph" model="ir.ui.view">
-            <field name="name">hr.attendance.graph</field>
+        <record id="view_hr_attendance_pivot" model="ir.ui.view">
+            <field name="name">hr.attendance.pivot</field>
             <field name="model">hr.attendance</field>
             <field name="arch" type="xml">
-                <graph string="Attendance" type="pivot">
+                <pivot string="Attendance">
                     <field name="employee_id" type="row"/>
                     <field name="name" type="col"/>
                     <field name="worked_hours" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
+        <record id="view_hr_attendance_graph" model="ir.ui.view">
+            <field name="name">hr.attendance.graph</field>
+            <field name="model">hr.attendance</field>
+            <field name="arch" type="xml">
+                <graph string="Attendance">
+                    <field name="employee_id"/>
+                    <field name="name"/>
+                    <field name="worked_hours" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -91,8 +103,7 @@
             <field name="name">Attendance Analysis</field>
             <field name="res_model">hr.attendance</field>
             <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_hr_attendance_graph"/>
+            <field name="view_mode">pivot,graph</field>
         </record>
 
         <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="5" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index a93853be41c..60eb0126612 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -2,11 +2,23 @@
 <openerp>
     <data>
 
+    <record id="view_evaluation_report_pivot" model="ir.ui.view">
+            <field name="name">hr.evaluation.report.pivot</field>
+            <field name="model">hr.evaluation.report</field>
+            <field name="arch" type="xml">
+            <pivot string="Appraisal Analysis" disable_linking="True">
+                 <field name="employee_id" type="row"/>
+                 <field name="create_date" interval="month" type="col"/>
+                 <field name="nbr" type="measure"/>
+             </pivot>
+         </field>
+    </record>
+
     <record id="view_evaluation_report_graph" model="ir.ui.view">
             <field name="name">hr.evaluation.report.graph</field>
             <field name="model">hr.evaluation.report</field>
             <field name="arch" type="xml">
-            <graph string="Appraisal Analysis" type="pivot" stacked="True">
+            <graph string="Appraisal Analysis">
                  <field name="employee_id" type="row"/>
                  <field name="create_date" interval="month" type="col"/>
                  <field name="nbr" type="measure"/>
@@ -46,11 +58,25 @@
         <field name="name">Appraisal Analysis</field>
         <field name="res_model">hr.evaluation.report</field>
         <field name="view_type">form</field>
-        <field name="view_mode">graph</field>
-        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="view_mode">pivot,graph</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_employee':1}</field>
         <field name="search_view_id" ref="view_evaluation_report_search"/>
     </record>
 
+    <record model="ir.actions.act_window.view" id="action_evaluation_view_report_pivot">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">pivot</field>
+        <field name="view_id" ref="view_evaluation_report_pivot"/>
+        <field name="act_window_id" ref="action_evaluation_report_all"/>
+    </record>
+    <record model="ir.actions.act_window.view" id="action_evaluation_view_report_graph">
+        <field name="sequence" eval="2"/>
+        <field name="view_mode">graph</field>
+        <field name="view_id" ref="view_evaluation_report_graph"/>
+        <field name="act_window_id" ref="action_evaluation_report_all"/>
+    </record>
+
+
     <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="2" groups="base.group_hr_manager"/>
 
     </data>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index aaade0fa274..14408d8c6ee 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -2,15 +2,27 @@
 <openerp>
 <data>
 
+    <record id="view_hr_expense_report_pivot" model="ir.ui.view">
+         <field name="name">hr.expense.report.pivot</field>
+         <field name="model">hr.expense.report</field>
+         <field name="arch" type="xml">
+             <pivot string="Expenses Analysis" disable_linking="True">
+                 <field name="employee_id" type="row"/>
+                 <field name="create_date" interval="month" type="col"/>
+                 <field name="price_total" type="measure"/>
+                 <field name="price_average" type="measure"/>
+             </pivot>
+         </field>
+    </record>
+
     <record id="view_hr_expense_report_graph" model="ir.ui.view">
          <field name="name">hr.expense.report.graph</field>
          <field name="model">hr.expense.report</field>
          <field name="arch" type="xml">
-             <graph string="Expenses Analysis" type="pivot" stacked="True">
+             <graph string="Expenses Analysis">
                  <field name="employee_id" type="row"/>
                  <field name="create_date" interval="month" type="col"/>
                  <field name="price_total" type="measure"/>
-                 <field name="price_average" type="measure"/>
              </graph>
          </field>
     </record>
@@ -50,8 +62,8 @@
         <field name="name">Expenses Analysis</field>
         <field name="res_model">hr.expense.report</field>
         <field name="view_type">form</field>
-        <field name="view_mode">graph</field>
-        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_employee':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="view_mode">pivot,graph</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_employee':1}</field>
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index b288db30572..1be1be3fb5d 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -2,16 +2,29 @@
 <openerp>
     <data>
 
-        <record model="ir.ui.view" id="view_holiday_graph">
-            <field name="name">hr.holidays.report_graph</field>
+        <record model="ir.ui.view" id="view_holiday_pivot">
+            <field name="name">hr.holidays.report_pivot</field>
             <field name="model">hr.holidays</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <graph string="Leaves Summary" type="pivot">
+                <pivot string="Leaves Summary">
                     <field name="employee_id" type="row"/>
                     <field name="type" type="row"/>
                     <field name="date_from" type="col"/>
                     <field name="number_of_days" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_holiday_graph">
+            <field name="name">hr.holidays.report_graph</field>
+            <field name="model">hr.holidays</field>
+            <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <graph string="Leaves Summary">
+                    <field name="employee_id"/>
+                    <field name="type"/>
+                    <field name="number_of_days" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -20,12 +33,24 @@
             <field name="name">Leaves Analysis</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="view_id" eval="view_holiday_simple"/>
+            <field name="view_mode">pivot,graph</field>
             <field name="domain">[('holiday_type','=','employee')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
+        <record model="ir.actions.act_window.view" id="action_window_leave_pivot">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">pivot</field>
+            <field name="view_id" ref="view_holiday_pivot"/>
+            <field name="act_window_id" ref="action_hr_available_holidays_report"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_window_leave_graph">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_holiday_graph"/>
+            <field name="act_window_id" ref="action_hr_available_holidays_report"/>
+        </record>
+
         <menuitem
             name="Leaves Analysis" 
             id="menu_hr_available_holidays_report_tree" 
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 4c0dd875e1f..66893d62075 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -5,7 +5,7 @@
          <record model="ir.actions.act_window" id="crm_case_categ0_act_job">
             <field name="name">Applications</field>
             <field name="res_model">hr.applicant</field>
-            <field name="view_mode">kanban,tree,form,graph,calendar</field>
+            <field name="view_mode">kanban,tree,form,pivot,graph,calendar</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
             <field name="context">{'empty_list_help_model': 'hr.job'}</field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 71cf48df2e6..94716411113 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -176,14 +176,26 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="crm_case_graph_view_job">
-        <field name="name">Jobs - Recruitment Graph</field>
+    <record model="ir.ui.view" id="crm_case_pivot_view_job">
+        <field name="name">Jobs - Recruitment</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
-              <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical" stacked="True">
+              <pivot string="Cases By Stage and Estimates">
                 <field name="job_id" type="row"/>
                 <field name="stage_id" type="col"/>
                 <field name="salary_expected" type="measure"/>
+            </pivot>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="crm_case_graph_view_job">
+        <field name="name">Jobs - Recruitment Graph</field>
+        <field name="model">hr.applicant</field>
+        <field name="arch" type="xml">
+              <graph string="Cases By Stage and Estimates">
+                <field name="job_id"/>
+                <field name="stage_id"/>
+                <field name="salary_expected" type="measure"/>
             </graph>
         </field>
     </record>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 62d23dae087..8ddc80126ea 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
+    <record id="view_hr_recruitment_report_pivot" model="ir.ui.view">
+         <field name="name">hr.recruitment.report.pivot</field>
+         <field name="model">hr.recruitment.report</field>
+         <field name="arch" type="xml">
+             <pivot string="Recruitment Analysis" disable_linking="True">
+                 <field name="stage_id" type="row"/>
+                 <field name="job_id" type="col"/>
+             </pivot>
+         </field>
+    </record>
+
     <record id="view_hr_recruitment_report_graph" model="ir.ui.view">
          <field name="name">hr.recruitment.report.graph</field>
          <field name="model">hr.recruitment.report</field>
          <field name="arch" type="xml">
-             <graph string="Recruitment Analysis" type="pivot">
+             <graph string="Recruitment Analysis">
                  <field name="stage_id" type="row"/>
                  <field name="job_id" type="col"/>
              </graph>
@@ -70,8 +81,7 @@
         <field name="name">Recruitment Analysis</field>
         <field name="res_model">hr.recruitment.report</field>
         <field name="view_type">form</field>
-        <field name="view_mode">graph</field>
-        <field name="context">{'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="view_mode">pivot,graph</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
     <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
index bfcd467fb44..6fa8894ac27 100644
--- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_hr_timesheet_report_graph" model="ir.ui.view">
-            <field name="name">hr.timesheet.report.graph</field>
+        <record id="view_hr_timesheet_report_pivot" model="ir.ui.view">
+            <field name="name">hr.timesheet.report.pivot</field>
             <field name="model">hr.timesheet.report</field>
             <field name="arch" type="xml">
-                <graph string="Timesheet" type="pivot">
+                <pivot string="Timesheet">
                     <field name="user_id" type="row"/>
                     <field name="date" interval="month" type="col"/>
                     <field name="quantity" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
+        <record id="view_hr_timesheet_report_graph" model="ir.ui.view">
+            <field name="name">hr.timesheet.report.graph</field>
+            <field name="model">hr.timesheet.report</field>
+            <field name="arch" type="xml">
+                <graph string="Timesheet">
+                    <field name="user_id"/>
+                    <field name="date" interval="month"/>
+                    <field name="quantity" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -43,8 +55,7 @@
             <field name="name">Timesheet Analysis</field>
             <field name="res_model">hr.timesheet.report</field>
             <field name="view_type">form</field>
-            <field name="view_mode">graph</field>
-            <field name="context">{'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="view_mode">pivot,graph</field>
         </record>
 
         <menuitem action="action_hr_timesheet_report_stat_all"  id="menu_hr_timesheet_report_all"