From f7777d457d89f7b99a7c512ab6111af0e2d99d1e Mon Sep 17 00:00:00 2001
From: Osenda <>
Date: Thu, 31 Mar 2011 09:25:04 +0200
Subject: [PATCH] [IMP] in payslip asked by qdp

bzr revid: osenda-20110331072504-pspga7znfo87dvl0
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 addons/hr_payroll/hr_payroll.py         | 1 +
 addons/hr_payroll/hr_payroll_view.xml   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 7740470ccc7..7ca34505ec3 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -385,7 +385,7 @@
                     <field name="name"/>
                     <field name="max_leaves"/>
                     <field name="leaves_taken"/>
-                    <field name="remaining_leaves"/>
+		    <field name="remaining_leaves"/>
                     <field name="limit" />
                 </tree>
             </field>
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 9b58ec9f56e..97890297754 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -402,6 +402,7 @@ class hr_holidays_status(osv.osv):
     _inherit = "hr.holidays.status"
     _columns = {
         # improve help
+        'code':fields.char('Code', size=16, readonly=False, help="It is used to define the code for Leave Type which will then be used in Salary Rules."),
     }
 
 hr_holidays_status()
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 8cffbc3b35a..81a7dd4f10b 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -298,7 +298,7 @@
                         </page>
 
                         <page string="Holidays">
-                            <field name="holiday_ids" colspan="4" nolabel="1"/>
+                            <field name="holiday_ids" colspan="4" nolabel="1" editable="bottom"/>
                         </page>
 
                        <page string="Details By Salary Head">