pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]new salary head view

Browse Source 
bzr revid: osenda-20110330133046-o4ef7gz1n1laekt5
This commit is contained in:
Osenda
2011-03-30 15:30:46 +02:00
parent ca98534357
commit 88de3c4148
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_payroll/hr_payroll.py
-1
View File
@@ -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()
addons/hr_payroll/hr_payroll_view.xml
+17 -3
View File
@@ -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"/>