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

[IMP]: improvement to the contract object 

bzr revid: mga@tinyerp.com-20101007144456-vu0v0750ujf8bgzq
This commit is contained in:
Mantavya Gajjar 2010-10-07 20:14:56 +05:30
parent d0e0cb7ad2
commit cf672602eb
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/hr_payroll/hr_payroll.py
View File

@ -136,7 +136,6 @@ class hr_contract(osv.osv):
ids += context.get('employee_structure', [])
for contract in self.browse(cr, uid, ids, context):
all_per = 0.0
ded_per = 0.0
all_fix = 0.0
@ -307,11 +306,11 @@ class hr_contract(osv.osv):
'visa_expire': fields.date('Visa Expire Date'),
'struct_id' : fields.many2one('hr.payroll.structure', 'Salary Structure'),
'working_days_per_week': fields.integer('Working Days', help="No of Working days / week for an employee"),
'basic': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Basic Salary'),
'gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Gross Salary'),
'net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Net Salary'),
'advantages_net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Deductions'),
'advantages_gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Allowances'),
'basic': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Basic Salary', digits=(14,2)),
'gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Gross Salary', digits=(14,2)),
'net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Net Salary', digits=(14,2)),
'advantages_net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Deductions', digits=(14,2)),
'advantages_gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Allowances', digits=(14,2)),
}
_defaults = {
'working_days_per_week': lambda *a: 5,

3
addons/hr_payroll/hr_payroll_view.xml
View File

@ -242,11 +242,8 @@
<group col="2" colspan="2">
<separator colspan="2" string="Advantages"/>
<field name="struct_id" select="1"/>
<field name="basic" groups="base.group_extended"/>
<field name="advantages_gross"/>
<field name="gross" groups="base.group_extended"/>
<field name="advantages_net"/>
<field name="net" groups="base.group_extended"/>
<field name="advantages" nolabel="1" colspan="2"/>
</group>
</page>