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

[IMP] hr_payroll:removed 'advantages_net' and 'advantages_gross' fields from hr.contract 

bzr revid: mtr@mtr-20110307084515-3o33wpeh1uh3czhe
This commit is contained in:
mtr 2011-03-07 14:15:15 +05:30
parent 971a91390a
commit 11c72fb988
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_contract/hr_contract.py
View File

@ -117,8 +117,6 @@ class hr_contract(osv.osv):
'working_hours': fields.many2one('resource.calendar','Working Schedule'),
'wage': fields.float('Wage', digits=(16,2), required=True, help="Basic Salary of the employee"),
'advantages': fields.text('Advantages'),
'advantages_net': fields.float('Net Advantages Value', digits=(16,2)),
'advantages_gross': fields.float('Gross Advantages Value', digits=(16,2)),
'notes': fields.text('Notes'),
'permit_no': fields.char('Work Permit No', size=256, required=False, readonly=False),
'passport_id': fields.many2one('hr.passport', 'Passport No', required=False),

2
addons/hr_contract/hr_contract_view.xml
View File

@ -180,8 +180,6 @@
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Advantages"/>
<field name="advantages_net"/>
<field name="advantages_gross"/>
<field name="advantages" nolabel="1" colspan="2"/>
</group>
<separator colspan="4" string="Notes"/>

2
addons/hr_payroll/hr_payroll_view.xml
View File

@ -48,7 +48,7 @@
<field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="/form/notebook/page/group/field[@name='advantages_net']" position="before">
<xpath expr="/form/notebook/page/group/field[@name='advantages']" position="before">
<field name="struct_id" select="1"/>
</xpath>
</data>