Merge lp:~openerp-dev/openobject-addons/6.1-opw-581655-ado into lp:openobject-addons/6.1

[Rifakat Husen (OpenERP)]

Solved maximum recursion problem while duplicating salary structure.

Unmerged revisions

7057. By Amit Dodiya<email address hidden> on 2012-11-05

[FIX] Max recurstion depth error while duplicating the salary structure

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2012-01-31 13:36:57 +0000
+++ hr_payroll/hr_payroll.py	2013-02-20 10:33:25 +0000
@@ -51,6 +51,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):
@@ -946,15 +947,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