Merge lp:~openerp-dev/openobject-addons/7.0-payroll-recursive-fix-csn into lp:openobject-addons/7.0

[Cedric Snauwaert (OpenERP)]

fix recursion problem in hr_payroll_structure due to same class structure defined below, change are made for v7.0 Do not forward in trunk

Unmerged revisions

9043. By Cedric Snauwaert (OpenERP) on 2013-04-19

[FIX]hr_payroll: forgot to remove one extra field (bad for v7.0)

9042. By Cedric Snauwaert (OpenERP) on 2013-04-19

[FIX]hr_payroll: fix recursion problem for v7.0 in hr_payroll_structure due to another class with same name
defined later in file, also add recursion check constraint. Do not forward those change in trunk

9041. By Cedric Snauwaert (OpenERP) on 2013-04-19

[FIX]hr_payroll: fix recursion problem in hr_payroll_structure due to another class with same name
defined later in file, also add recursion check constraint

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2012-12-17 15:23:03 +0000
+++ hr_payroll/hr_payroll.py	2013-04-19 08:39:37 +0000
@@ -68,6 +68,20 @@
         'parent_id': _get_parent,
     }
 
+    def _check_recursion(self, cr, uid, ids, context=None):
+        level = 100
+        while len(ids):
+            cr.execute('select distinct parent_id from hr_payroll_structure where id IN %s',(tuple(ids),))
+            ids = filter(None, map(lambda x:x[0], cr.fetchall()))
+            if not level:
+                return False
+            level -= 1
+        return True
+
+    _constraints = [
+        (_check_recursion, 'Error ! You cannot create recursive Salary Structure.', ['parent_id']) 
+    ]
+        
     def copy(self, cr, uid, id, default=None, context=None):
         """
         Create a new record in hr_payroll_structure model from existing one
@@ -951,14 +965,14 @@
 
 hr_payslip_line()
 
-class hr_payroll_structure(osv.osv):
+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()
+hr_payroll_structure_()
 
 class hr_employee(osv.osv):
     '''