diff options
| author | DBR (OpenERP) <dbr@tinyerp.com> | 2012-06-29 10:53:02 +0530 |
|---|---|---|
| committer | DBR (OpenERP) <dbr@tinyerp.com> | 2012-06-29 10:53:02 +0530 |
| commit | bb13aed14cc314c05aa6cd5fd51d459d8a249e57 (patch) | |
| tree | 83e8868d9a71d96e2ff868d809b54cfe1b63ce21 /addons/hr_payroll | |
| parent | 51c05a3300084e2afbcf4aa37f066ecead05f62e (diff) | |
| parent | 3c6d5dabfb10938ef3b7135d0b3565ff962ce6ae (diff) | |
[Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-20120629052302-fdamc34vbkwp2ue7
Diffstat (limited to 'addons/hr_payroll')
| -rw-r--r-- | addons/hr_payroll/hr_payroll.py | 5 | ||||
| -rw-r--r-- | addons/hr_payroll/hr_payroll_data.xml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index e8f96df261b..676eedf4ebc 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -156,7 +156,8 @@ class contrib_register(osv.osv): _description = 'Contribution Register' _columns = { - 'company_id':fields.many2one('res.company', 'Company', required=False), + 'company_id':fields.many2one('res.company', 'Company'), + 'partner_id':fields.many2one('res.partner', 'Partner'), 'name':fields.char('Name', size=256, required=True, readonly=False), 'register_line_ids':fields.one2many('hr.payslip.line', 'register_id', 'Register Line', readonly=True), 'note': fields.text('Description'), @@ -773,7 +774,7 @@ class hr_salary_rule(osv.osv): 'company_id':fields.many2one('res.company', 'Company', required=False), 'condition_select': fields.selection([('none', 'Always True'),('range', 'Range'), ('python', 'Python Expression')], "Condition Based on", required=True), 'condition_range':fields.char('Range Based on',size=1024, readonly=False, help='This will be used to compute the % fields values; in general it is on basic, but you can also use categories code fields in lowercase as a variable names (hra, ma, lta, etc.) and the variable basic.'), - 'condition_python':fields.text('Python Condition', required=True, readonly=False, help='Applied this rule for calculation if condition is true. You can specify condition like basic > 1000.'),#old name = conditions + 'condition_python':fields.text('Python Condition', required=True, readonly=False, help='Applied this rule for calculation if condition is true. You can specify condition like basic > 1000.'), 'condition_range_min': fields.float('Minimum Range', required=False, help="The minimum amount, applied for this rule."), 'condition_range_max': fields.float('Maximum Range', required=False, help="The maximum amount, applied for this rule."), 'amount_select':fields.selection([ diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml index 227fa2e9013..9faeb0824f6 100644 --- a/addons/hr_payroll/hr_payroll_data.xml +++ b/addons/hr_payroll/hr_payroll_data.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data noupdate="1"> + <record id="contrib_register_employees" model="hr.contribution.register"> + <field name="name">Employees</field> + <field name="partner_id" eval="False"/> + </record> <record id="BASIC" model="hr.salary.rule.category"> <field name="name">Basic</field> @@ -60,6 +64,7 @@ <field name="condition_select">none</field> <field name="amount_select">code</field> <field name="amount_python_compute">result = categories.BASIC + categories.ALW + categories.DED</field> + <field name="register_id" ref="contrib_register_employees"/> </record> |