odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] improve Holidays and Details by Salary Head tab view of payslip 

bzr revid: psi@tinyerp.co.in-20110401112511-dxidmww1ujzxgrg2
This commit is contained in:
psi (Open ERP) 2011-04-01 16:55:11 +05:30
parent 6056d569ae
commit 6ee3a940ed
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
addons/hr_payroll/hr_payroll_view.xml
View File

@ -290,11 +290,36 @@
</page>
<page string="Details By Salary Head">
<field name="details_by_salary_head" nolabel="1" context="{'group_by': 'category_id'}"/>
<field name="details_by_salary_head" nolabel="1" context="{'group_by': 'category_id'}">
<tree string="Salary Rules">
<field name="category_id"/>
<field name="sequence" groups="base.group_extended"/>
<field name="name"/>
<field name="code"/>
<field name="type"/>
<field name="amount_type"/>
<field name="amount"/>
</tree>
</field>
</page>
<page string="Holidays">
<field name="holiday_ids" colspan="4" nolabel="1" editable="bottom"/>
<field name="holiday_ids" colspan="4" nolabel="1" editable="bottom">
<tree colors="red:state in ('refuse');blue:state in ('draft');black:state in ('confirm','validate','validate1')" string="Leaves" >
<field name="employee_id" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="holiday_status_id"/>
<field name="name"/>
<field name="number_of_days" string="Number of Days" sum='Remaining Days'/>
<field name="manager_id" invisible="1"/>
<field name="user_id" invisible="1"/>
<!--field name="type"/-->
<field name="state"/>
<field name="contract_id"/>
<button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
<button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
</tree>
</field>
</page>
<page string="Other Information">