Merge lp:~openerp-dev/openobject-addons/trunk-fix-1021130-duplicatepayroll-jco-tta into lp:openobject-addons

[Josse Colpaert (OpenERP)]

Removed second definition of payroll structure class. It will avoid recursiveness of copy function.

Unmerged revisions

8668. By Josse Colpaert (OpenERP) on 2013-04-11

[FIX] Only one class hr_payroll_structure in same file

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2013-03-29 14:37:20 +0000
+++ hr_payroll/hr_payroll.py	2013-04-11 13:00:33 +0000
@@ -50,6 +50,7 @@
         'note': fields.text('Description'),
         'parent_id':fields.many2one('hr.payroll.structure', 'Parent'),
         'children_ids':fields.one2many('hr.payroll.structure', 'parent_id', 'Children'),
+        'rule_ids':fields.many2many('hr.salary.rule', 'hr_structure_salary_rule_rel', 'struct_id', 'rule_id', 'Salary Rules'),
     }
 
     def _get_parent(self, cr, uid, context=None):
@@ -949,15 +950,6 @@
 
 hr_payslip_line()
 
-class hr_payroll_structure(osv.osv):
-
-    _inherit = 'hr.payroll.structure'
-    _columns = {
-        'rule_ids':fields.many2many('hr.salary.rule', 'hr_structure_salary_rule_rel', 'struct_id', 'rule_id', 'Salary Rules'),
-    }
-
-hr_payroll_structure()
-
 class hr_employee(osv.osv):
     '''
     Employee