← Back to branch summary

~openerp-commiter/openobject-addons/trunk-extra-addons

« back to all changes in this revision

Viewing changes to payroll/payroll-4.1.1/tax.py

bugfix in overlay creation system

Show diffs side-by-side

added added

removed removed

Lines of Context:
payroll/payroll-4.1.1/tax.py
 
1
# -*- encoding: utf-8 -*-
1
2
##############################################################################
2
3
#
3
4
# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
33
34
from osv import fields, osv
34
35
 
35
36
class hr_employee_salary_allowance(osv.osv):
36
 
        _name = "hr.employee.salary.allowance"
37
 
        _description = "Employee Allowances"
38
 
        _columns = {
 
37
    _name = "hr.employee.salary.allowance"
 
38
    _description = "Employee Allowances"
 
39
    _columns = {
39
40
                'allowance_id': fields.many2one('hr.employee', 'Allowance', select=True),
40
 
                'name' : fields.char('Allowance', size=32, required=True),
 
41
        'name' : fields.char('Allowance', size=32, required=True),
41
42
                'value' : fields.float('Value', digits=(16,2)),
42
43
                'taxable' : fields.boolean("Taxable"),
43
44
        }
44
 
        _order = 'name desc'
 
45
    _order = 'name desc'
45
46
hr_employee_salary_allowance()
46
47
 
47
48
class hr_employee_salary_deduction(osv.osv):
48
 
        _name = "hr.employee.salary.deduction"
49
 
        _description = "Employee Deductions"
50
 
        _columns = {
 
49
    _name = "hr.employee.salary.deduction"
 
50
    _description = "Employee Deductions"
 
51
    _columns = {
51
52
                'deduction_id': fields.many2one('hr.employee', 'Deduction', select=True),
52
 
                'name' : fields.char('Deduction', size=32, required=True),
 
53
        'name' : fields.char('Deduction', size=32, required=True),
53
54
                'value' : fields.float('Value', digits=(16,2)),
54
55
                'remark' : fields.text('Remark'),
55
56
        }
56
 
        _order = 'name desc'
 
57
    _order = 'name desc'
57
58
hr_employee_salary_deduction()
58
59
 
59
60
class hr_employee_salary_declaration(osv.osv):
60
 
        _name = "hr.employee.salary.declaration"
61
 
        _description = "Employee Tax Declarations"
62
 
        _columns = {
 
61
    _name = "hr.employee.salary.declaration"
 
62
    _description = "Employee Tax Declarations"
 
63
    _columns = {
63
64
                'declaration_id': fields.many2one('hr.employee', 'Declaration', select=True),
64
 
                'name' : fields.char('Description', size=32, required=True),
 
65
        'name' : fields.char('Description', size=32, required=True),
65
66
                'value' : fields.float('Value', digits=(16,2)),
66
67
                'remark' : fields.text('Remark'),
67
68
        }
68
 
        _order = 'name desc'
 
69
    _order = 'name desc'
69
70
hr_employee_salary_declaration()
70
71
 
71
 
# vim:tw=0:noexpandtab
 
72
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
73