From 4c30879da8d375cf3c3f4c7cb414817a5dc9bd78 Mon Sep 17 00:00:00 2001
From: Kinjal Mehta <kme@odoo.com>
Date: Thu, 5 May 2016 11:10:19 +0530
Subject: [PATCH] [IMP] hr_holidays: Several usability improvements

Change the menu tip of Allocation Request, Leaves, Leaves Allocations and Leaves details.
Change the filter name 'Current Year' instead of Current.
The default filter My requests has been removed. (in SAAS10, there is a ir_rule forcing the exact same domain)
And In the m2o field leave type in leave request, change it in to (3 remaining out of 5) instead of like (3/5).
---
 addons/hr_holidays/hr_holidays.py       |  2 +-
 addons/hr_holidays/hr_holidays_view.xml | 30 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 8db93ea5a7c..46a39a1367d 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -94,7 +94,7 @@ class hr_holidays_status(osv.osv):
         for record in self.browse(cr, uid, ids, context=context):
             name = record.name
             if not record.limit:
-                name = name + ('  (%g/%g)' % (record.virtual_remaining_leaves or 0.0, record.max_leaves or 0.0))
+                name = name + ('  (%g remaining out of %g)' % (record.virtual_remaining_leaves or 0.0, record.max_leaves or 0.0))
             res.append((record.id, name))
         return res
 
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 455c8934aec..676ec7517fd 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -36,7 +36,7 @@
                     <separator/>
                     <filter string="To Do" name="todo" domain="[('payslip_status', '=', False), ('holiday_status_id.active', '=', True)]"/>
                     <separator/>
-                    <filter name="year" string="Current"
+                    <filter name="year" string="Current Year"
                         domain="[('holiday_status_id.active', '=', True)]" help="Active Leaves and Allocations"/>
                     <separator/>
                     <filter string="My Requests" name="my_leaves" domain="[('user_id', '=', uid)]"/>
@@ -269,7 +269,6 @@
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="context">{
                 'default_type': 'remove',
-                'search_default_my_leaves':1,
                 'needaction_menu_ref':
                 [
                     'hr_holidays.menu_open_company_allocation',
@@ -351,12 +350,16 @@
             <field name="view_type">form</field>
             <field name="context">{
                 'default_type':'add',
-                'search_default_my_leaves':1,
                 'needaction_menu_ref':
                 [
                     'hr_holidays.menu_open_company_allocation',
                 ]
             }</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to create a new leave allocation request.
+                </p>
+            </field>
             <field name="domain">[('type','=','add')]</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
@@ -419,7 +422,6 @@
             <field name="context">{
                 'search_default_group_type': 1,
                 'search_default_year': 1 ,
-                'search_default_my_leaves': 1,
                 'needaction_menu_ref':
                 [
                     'hr_holidays.menu_open_ask_holidays_new',
@@ -428,6 +430,11 @@
                     'hr_holidays.menu_open_employee_leave',
                 ]
             }</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to create a new leave request.
+                </p>
+            </field>
             <field name="domain">[('holiday_type','=','employee')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
@@ -441,6 +448,11 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="view_id" eval="view_holiday_employee"/>
             <field name="context">{'default_type': 'remove', 'search_default_todo': 1}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to create a new leave request.
+                </p>
+            </field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
@@ -451,6 +463,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="context">{'search_default_department':1, 'search_default_approve':1}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to create a new leave request.
+                </p>
+            </field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
@@ -463,6 +480,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="context">{'default_type':'add', 'search_default_department':1, 'search_default_approve':1}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to create a new leave allocation.
+                </p>
+            </field>
             <field name="domain">[('type','=','add')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>