From b77cad685a012325d466338bb31a7ff089340dfa Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Wed, 13 Oct 2010 18:53:17 +0530
Subject: [PATCH] [MOD/IMP] hr_holidays : Remove Leave Analysis report and
 changes in view file

bzr revid: amp@tinyerp.com-20101013132317-do4ylbfso07qdc66
---
 addons/hr_holidays/hr_holidays_view.xml       |   2 +-
 .../report/available_holidays_view.xml        |   4 +-
 .../hr_holidays/report/hr_holidays_report.py  |  61 -----------
 .../report/hr_holidays_report_view.xml        | 102 ------------------
 .../hr_holidays/security/ir.model.access.csv  |   1 -
 5 files changed, 3 insertions(+), 167 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1f57b25d402..b334d340b98 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -137,7 +137,7 @@
                         <field name="notes" nolabel="1" colspan="4" />
                         <newline/>
                         <field name="state" colspan="2"/>
-                        <group colspan="2">
+                        <group colspan="2" col="6">
                             <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
                             <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
                             <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index b4cb2a99b7a..75b639b1b79 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -87,7 +87,7 @@
 	    </record>
 
         <record id="action_hr_available_holidays_report" model="ir.actions.act_window">
-            <field name="name">Available Holidays</field>
+            <field name="name">Leaves Analysis</field>
             <field name="res_model">available.holidays.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
@@ -109,7 +109,7 @@
                 <field name="act_window_id" ref="action_hr_available_holidays_report"/>
         </record>
 
-        <menuitem name="Available Holidays" id="menu_hr_available_holidays_report_tree" action="action_hr_available_holidays_report" parent="menu_hr_reporting_holidays"/>
+        <menuitem name="Leaves Analysis" id="menu_hr_available_holidays_report_tree" action="action_hr_available_holidays_report" parent="menu_hr_reporting_holidays"/>
 
 	</data>
 </openerp>
diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index 5d2dc27c0de..f7b813f9cc5 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -22,67 +22,6 @@
 import tools
 from osv import fields,osv
 
-class hr_holidays_report(osv.osv):
-    _name = "hr.holidays.report"
-    _description = "Leaves Statistics By Employee and category"
-    _auto = False
-    _rec_name = 'date'
-    _columns = {
-        'date': fields.date('Date', readonly=True),
-        'delay_approve': fields.float('Delay to Approve', digits=(16,2),readonly=True),
-        'year': fields.char('Year', size=4, readonly=True),
-        'day': fields.char('Day', size=15, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
-            ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
-        'date_from' : fields.datetime('Start Date', readonly=True),
-        'date_to' : fields.datetime('End Date', readonly=True),
-        'number_of_days_temp': fields.float('Number of Days', readonly=True),
-        'employee_id' : fields.many2one('hr.employee', "Employee's Name", readonly=True),
-        'category_id' : fields.many2one('hr.employee.category', "Category's Name", readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'holiday_status_id' : fields.many2one("hr.holidays.status", "Leave Type",readonly=True),
-        'department_id':fields.many2one('hr.department','Department',readonly=True),
-        'state': fields.selection([('draft', 'Draft'),
-                                   ('confirm', 'Waiting Validation'),
-                                   ('refuse', 'Refused'),
-                                   ('validate', 'Validated'),
-                                   ('cancel', 'Cancelled')]
-                                   ,'State', readonly=True),
-    }
-    _order = 'date desc'
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'hr_holidays_report')
-        cr.execute("""
-            create or replace view hr_holidays_report as (
-                 select
-                     min(s.id) as id,
-                     date_trunc('day',s.create_date) as date,
-                     date_trunc('day',s.date_from) as date_from,
-                     date_trunc('day',s.date_to) as date_to,
-                     sum(s.number_of_days_temp) as number_of_days_temp,
-                     s.employee_id,
-                     s.category_id,
-                     s.user_id as user_id,
-                     to_char(s.date_from, 'YYYY') as year,
-                     to_char(s.date_from, 'MM') as month,
-                     to_char(s.date_from, 'YYYY-MM-DD') as day,
-                     s.holiday_status_id,
-                     s.department_id,
-                     s.state,
-                     avg(extract('epoch' from age(s.create_date,CURRENT_DATE)))/(3600*24) as  delay_approve                     
-                     from
-                 hr_holidays s
-                 WHERE type='remove'
-                 GROUP BY
-                     s.create_date,s.state,s.date_from,s.date_to,
-                     s.employee_id,s.user_id,s.holiday_status_id,
-                     s.department_id, s.category_id
-            )
-        """)
-
-hr_holidays_report()
-
 class hr_holidays_remaining_leaves_user(osv.osv):
     _name = "hr.holidays.remaining.leaves.user"
     _description = "Total holidays by type"
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index e2ffc0fc0e9..51ff25fea75 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -2,108 +2,6 @@
 <openerp>
 	<data>
 
-    <record id="view_hr_holidays_report_tree" model="ir.ui.view">
-        <field name="name">hr.holidays.report.tree</field>
-        <field name="model">hr.holidays.report</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('confirm','refuse','validate');gray:state in('cancel')" string="Leaves Statistics">
-                <field name="date" invisible="1"/>
-                <field name="employee_id" invisible="1"/>
-                <field name="category_id" invisible="1"/>
-                <field name="user_id" invisible="1"/>
-                <field name="date_from" invisible="1"/>
-                <field name="date_to" invisible="1"/>
-                <field name="number_of_days_temp" sum="#Days"/>
-                <field name="delay_approve"/>
-                <field name="holiday_status_id" invisible="1"/>
-                <field name="department_id" invisible="1"/>
-                <field name="year" invisible="1"/>
-                <field name="day" invisible="1"/>
-                <field name="month" invisible="1"/>
-                <field name="state" invisible="1"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_hr_holidays_report_graph" model="ir.ui.view">
-         <field name="name">hr.holidays.report.graph</field>
-         <field name="model">hr.holidays.report</field>
-         <field name="type">graph</field>
-         <field name="arch" type="xml">
-             <graph string="Leaves Statistics" type="bar">
-                 <field name="employee_id"/>
-                 <field name="number_of_days_temp" operator="+"/>
-                 <field name="state" group = "True"/>
-             </graph>
-         </field>
-    </record>
-
-    <record id="view_hr_holidays_report_search" model="ir.ui.view">
-        <field name="name">hr.holidays.report.search</field>
-        <field name="model">hr.holidays.report</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Leaves">
-            	<group>
-	            	<filter icon="terp-go-year" string=" Year "
-                    	domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Leaves taken in current year"/>
-                    <filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Leaves taken in current month"/>
-	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                       domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Leaves taken in last month"/>
-	                <separator orientation="vertical"/>
-	                <filter string="Future Leaves" icon="terp-gtk-media-pause" domain="[('state', 'in' ,('draft','confirm'))]"
-	                	help = "Draft and Confirmed leaves"/>
-	               	<filter string="Validated" name="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
-	               		help = "Pending Leaves"/>
-                  <filter icon="gtk-cancel" string="Cancelled" domain="[('state','=','cancel')]"/>
-					<separator orientation="vertical"/>
-                    <field name="department_id"/>
-					<field name="employee_id"/>
-	            </group>
-	            <newline/>
-                <group expand="0" string="Extended Filters..." colspan="10" col="12">
-                    <field name="holiday_status_id"/>
-                    <field name="category_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="user_id"/>
-                    <newline/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                </group>
-                <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter icon="terp-personal" string="Employee" name="Employee" context="{'group_by':'employee_id'}"
-                            help="Leaves by empolyee"/>
-                    <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <separator orientation="vertical"/>
-                     <filter string="Department" name="department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-stock_symbol-selection" string="Category" context="{'group_by':'category_id'}"
-                            help="Leaves by category"/>
-                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
-                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
-    <record id="action_hr_holidays_report_all" model="ir.actions.act_window">
-        <field name="name">Leaves Analysis</field>
-        <field name="res_model">hr.holidays.report</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_Employee':1,'search_default_department':1,"search_default_Validated":1, 'group_by':[], 'group_by_no_leaf':1} </field>
-        <field name="search_view_id" ref="view_hr_holidays_report_search"/>
-    </record>
-
-    <menuitem action="action_hr_holidays_report_all" id="menu_hr_holidays_report_all" parent="menu_hr_reporting_holidays" sequence="0"/>
-
 	<record id="view_hr_holidays_remaining_leaves_user_tree" model="ir.ui.view">
         <field name="name">hr.holidays.remaining.leaves.user.tree</field>
         <field name="model">hr.holidays.remaining.leaves.user</field>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 20da4832fe2..f350b73ed64 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -2,6 +2,5 @@
 "access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,1,1,1
 "access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,1
 "access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,1,1,1
-"access_hr_holidays_report_manager","hr.holidays.report.manager","model_hr_holidays_report","base.group_hr_manager",1,1,1,1
 "access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1
 "access_available_holidays_report_user","hr.available.holidays.report.user","model_available_holidays_report","base.group_hr_user",1,1,1,1