From 12e1861871a2c43f74cbaa9803f7a0f0f1feb020 Mon Sep 17 00:00:00 2001
From: rsi-odoo <rsi@openerp.com>
Date: Tue, 10 Mar 2015 12:02:49 +0530
Subject: [PATCH] [IMP] hr_expense, hr_holidays: add new 'leaves' and
 'expenses' filters for managers

HR Manager can see 'My Team Expenses/Leaves' filter and improve domain of 'My Expenses' and 'My Department Leaves' filter
---
 addons/hr_expense/hr_expense_view.xml   | 3 ++-
 addons/hr_holidays/hr_holidays_view.xml | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index fb75faaeafd..317d723bd5d 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -161,7 +161,8 @@
                     <filter domain="[('state','=','confirm')]" string="To Approve" name="confirm" help="Confirmed Expenses"/>
                     <filter domain="[('state','=','accepted')]" string="To Pay" name="approved" help="Expenses to Invoice"/>
                     <separator />
-                    <filter domain="[('user_id', '=', uid)]" string="My Expenses"/>
+                    <filter string="My Expenses" domain="[('employee_id.user_id', '=', uid)]"/>
+                    <filter string="My Team Expenses" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="base.group_hr_manager" help="Expenses of Your Team Member"/>
                     <separator />
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <group expand="0" string="Group By">
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 2b03f208544..bc32988154a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -22,19 +22,18 @@
                 <search string="Search Leave">
                     <field name="name"/>
                     <filter domain="[('state','in',('confirm','validate1'))]" string="To Approve" name="approve"/>
-                    <filter domain="[('state','=','validate')]" string="Validated" name="validated"/>
+                    <filter string="Approved Leaves" domain="[('state', '=', 'validate')]" name="validated"/>
                     <separator/>
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
-                    <filter string="Approved Leaves" name="validated" domain="[('state','=','validate')]"/>
+                    <filter string="My Department Leaves" domain="[('department_id.manager_id.user_id', '=', uid)]" help="My Department Leaves"/>
+                    <filter string="My Team Leaves" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="base.group_hr_manager" help="Leaves of Your Team Member"/>
                     <separator/>
                     <filter string="To Report in Payslip" name="gray" domain="[('payslip_status', '=', False)]" groups="base.group_hr_manager"/>
                     <separator/>
                     <filter name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
                     <separator/>
                     <filter string="To Do" name="todo" domain="[('payslip_status', '=', False), ('holiday_status_id.active', '=', True)]"/>
-                    <separator/>
-                    <filter string="My Department Leaves" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                     <field name="employee_id"/>
                     <field name="department_id" groups="hr.group_multi_departments"/>
                     <field name="holiday_status_id"/>