From 88de3c4148d75508c83d709e1ac3582f88dc8744 Mon Sep 17 00:00:00 2001
From: Osenda <>
Date: Wed, 30 Mar 2011 15:30:46 +0200
Subject: [PATCH] [IMP]new salary head view

bzr revid: osenda-20110330133046-o4ef7gz1n1laekt5
---
 addons/hr_payroll/hr_payroll.py       |  1 -
 addons/hr_payroll/hr_payroll_view.xml | 20 +++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 97890297754..9b58ec9f56e 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -402,7 +402,6 @@ 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 04765538662..8cffbc3b35a 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -236,7 +236,7 @@
                         <field name="struct_id" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Salary Computation">
+                        <page string="Salary Computation" attrs="{'invisible':[('Salary Computation')]}">
                             <field name="line_ids" colspan="4" nolabel="1">
                                 <tree string="Salary Structure" editable="bottom">
                                     <field name="category_id" on_change="onchange_category(category_id)"/>
@@ -288,9 +288,23 @@
                                 <field name="total_pay"/>
                             </group> -->
                         </page>
-                        <page string="Holidays">
-                            <field name="holiday_ids" colspan="4" nolabel="1" editable="bottom"/>
+
+                        <page string="Applied Salary Rules" attrs="{'invisible':[('Applied Salary Rules')]}">
+                            <field name="applied_salary_rule" nolabel="1" />
                         </page>
+			
+                       <page string="Appears On Payslip">
+                            <field name="appears_on_payslip_rule" nolabel="1"/>
+                        </page>
+
+                        <page string="Holidays">
+                            <field name="holiday_ids" colspan="4" nolabel="1"/>
+                        </page>
+
+                       <page string="Details By Salary Head">
+                            <field name="details_by_salary_head" nolabel="1" context="{'group_by': 'category_id'}"/>
+                       </page>
+
                         <page string="Other Information">
                             <group col="2" colspan="1">
                                 <separator colspan="2" string="Other Information"/>