From cb46f350915a5bfb298492016fdc18afac24ad44 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 27 May 2011 17:09:19 +0530
Subject: [PATCH 1/2] [IMP]hr_holidayse: Rename column "Remaining leaves" into
 "remaining legal leaves"

bzr revid: aag@tinyerp.co.in-20110527113919-40be1anwsqhntfu5
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 56fb7faddfc..b6d495c1cb5 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -451,7 +451,7 @@
             <field name="arch" type="xml">
                 <tree string="Assign Leaves" editable="top">
                     <field name="name" string="Employee"/>
-                    <field name="remaining_leaves"/>
+                    <field name="remaining_leaves" string="Remaining Legal Leaves"/>
                 </tree>
             </field>
         </record>  

From 8c5726ef5f886c2cbe40bfe8546305f5a623a761 Mon Sep 17 00:00:00 2001
From: "aag (OpenERP)" <aag@tinyerp.co.in>
Date: Fri, 27 May 2011 17:56:56 +0530
Subject: [PATCH 2/2] [IMP]hr_holidayse: raise an error if there are more than
 1 leave type with "allow to override limit" = False, also if there is no such
 leave type

bzr revid: aag@tinyerp.co.in-20110527122656-rouugxlm417tj5fp
---
 addons/hr_holidays/hr_holidays.py       | 2 ++
 addons/hr_holidays/hr_holidays_data.xml | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index d8605f297b0..51bd704b94d 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -333,6 +333,8 @@ class hr_employee(osv.osv):
         holiday_obj = self.pool.get('hr.holidays')
         # Find for holidays status
         status_ids = type_obj.search(cr, uid, [('limit', '=', False)], context=context)
+        if len(status_ids) != 1 :
+            raise osv.except_osv(('warning !'),_("You should have only one leave type without allowing override limit, %s Found !") % (len(status_ids)))
         status_id = status_ids and status_ids[0] or False
         if not status_id or diff <= 0:
             return False
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 825f8b672d2..2c0debb3552 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -5,7 +5,6 @@
     <!-- Casual leave -->
     <record model="hr.holidays.status" id="holiday_status_cl">
       <field name="name">Legal Leaves</field>
-      <field name="limit">False</field>
       <field name="color_name">black</field>
     </record>
 
@@ -20,7 +19,7 @@
     <!-- Compensatory Days -->
     <record model="hr.holidays.status" id="holiday_status_comp">
       <field name="name">Compensatory Days</field>
-      <field name="limit">False</field>
+      <field name="limit">True</field>
       <field name="color_name">brown</field>
     </record>