Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-1021130-tta into lp:openobject-addons

  1. trunk-bug-1021130-tta
  2. Merge into trunk
Proposed by SnippetBucket.com
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1021130-tta
Merge into: lp:openobject-addons
Diff against target: 20 lines (+2/-2)
1 file modified
hr_payroll/hr_payroll.py (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1021130-tta
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+142464@code.launchpad.net

This proposal supersedes a proposal from 2013-01-09.

Description of the change

Hello,

make correction in calling the hr_payroll_structure_inherit().

Thanks,
tta

To post a comment you must log in.

Unmerged revisions

8498. By SnippetBucket.com

[FIX] missing hr_payroll_structure_inherit()

8497. By SnippetBucket.com

Merged latest.

8496. By SnippetBucket.com

[FIX] improve code to inherit hr_payroll_structure.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_payroll/hr_payroll.py'
2--- hr_payroll/hr_payroll.py 2012-12-17 15:23:03 +0000
3+++ hr_payroll/hr_payroll.py 2013-01-09 10:16:23 +0000
4@@ -951,14 +951,14 @@
5
6 hr_payslip_line()
7
8-class hr_payroll_structure(osv.osv):
9+class hr_payroll_structure_inherit(osv.osv):
10
11 _inherit = 'hr.payroll.structure'
12 _columns = {
13 'rule_ids':fields.many2many('hr.salary.rule', 'hr_structure_salary_rule_rel', 'struct_id', 'rule_id', 'Salary Rules'),
14 }
15
16-hr_payroll_structure()
17+hr_payroll_structure_inherit()
18
19 class hr_employee(osv.osv):
20 '''

Subscribers

People subscribed via source and target branches

to all changes: