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

[IMP] hr_payroll: renamed struct_id field of hr.payroll.structure into parent_id 

bzr revid: qdp-launchpad@openerp.com-20110228095643-rji364bszjfq2a60
This commit is contained in:
Quentin (OpenERP) 2011-02-28 10:56:43 +01:00
parent 4196288c4e
commit 91f14201bf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_payroll/hr_payroll.py
View File

@ -97,7 +97,7 @@ class hr_payroll_structure(osv.osv):
'line_ids':fields.one2many('hr.payslip.line', 'function_id', 'Salary Structure', required=False),
'company_id':fields.many2one('res.company', 'Company', required=False),
'note': fields.text('Description'),
'struct_id':fields.many2one('hr.payroll.structure', 'Parent Structure'),
'parent_id':fields.many2one('hr.payroll.structure', 'Parent Structure'),
}
_defaults = {
'company_id': lambda self, cr, uid, context: \

2
addons/hr_payroll/hr_payroll_view.xml
View File

@ -210,7 +210,7 @@
<group col="6" colspan="4">
<field name="name" colspan="4" select="1"/>
<field name="code" select="1"/>
<field name="struct_id"/>
<field name="parent_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<notebook colspan="4">