From 5ed128270f0ffca9d6755cff338f26e3ff88f36c Mon Sep 17 00:00:00 2001 From: "Pinakin Nayi (OpenERP)" Date: Thu, 9 Aug 2012 12:42:00 +0530 Subject: [PATCH] [IMP]issur4-hr-imp bzr revid: pna@tinyerp.com-20120809071200-nvqphqv9swzqs2pu --- addons/hr_evaluation/hr_evaluation_view.xml | 8 +++++--- addons/hr_holidays/hr_holidays_view.xml | 14 ++++++++++++-- addons/hr_timesheet/hr_timesheet_view.xml | 4 ++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 6d54e6278b1..c2688af1812 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -277,14 +277,16 @@
+
+
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 4469fa73fbe..de9c65fe042 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -340,7 +340,7 @@ Requests Approve hr.holidays form - {'default_type': 'add', 'search_default_approve':1} + {'default_type': 'remove', 'search_default_approve':1} [('type','=','remove')] @@ -507,7 +507,17 @@ - + + Leaves + ir.actions.act_window + hr.holidays + hr.employee + form + tree,form + {'search_default_employee_id': [active_id], 'default_employee_id': active_id} + [('type','=','remove')] + + diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 895474e9d7f..b141cef1bb4 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -14,7 +14,7 @@ - + @@ -42,7 +42,7 @@ -