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

[IMP] hr_payroll:made 'struct_id' fields.related on hr.payslip 

bzr revid: mtr@mtr-20110323132959-qklty03qyl35ytpt
This commit is contained in:
mtr 2011-03-23 18:59:59 +05:30
parent 36ab36f290
commit e80c3728f3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr_payroll/hr_payroll.py
View File

@ -474,7 +474,7 @@ class hr_payslip(osv.osv):
return 0.0
_columns = {
'struct_id':fields.many2one('hr.payroll.structure', 'Designation', readonly=True, states={'draft': [('readonly', False)]}),
'struct_id':fields.related('contract_id', 'struct_id', type='many2one', relation='hr.payroll.structure', string='Structure', store=True, ),
'register_id':fields.many2one('hr.payroll.register', 'Register', required=False, readonly=True, states={'draft': [('readonly', False)]}),
'name':fields.char('Name', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}),
'number':fields.char('Number', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}),
@ -1038,7 +1038,7 @@ class hr_payslip(osv.osv):
basic = contract.wage
number = sequence_obj.get(cr, uid, 'salary.slip')
update['value'].update({
'struct_id': function,
# 'struct_id': function,
'number': number,
'basic_amount': round(basic),
'basic_before_leaves': round(basic),