Merge lp:~openerp-dev/openobject-addons/7.0-opw-605859-pna into lp:openobject-addons/7.0

[Pinakin Nayi (OpenERP)]

Hello Sir,

I fixed issue Concerning, the hr_payroll module. When configuring payroll rules with python code.

Problem:
When creating a salary rule with python code.
If result_rate is filled for one rule, the value persists for all other rules computed with python code.

Thanks,
pna

[Martin Trigaux (OpenERP) (mat-openerp)]

Merged in 7.0

revno: 9947 [merge]
revision-id: <email address hidden>

review: Approve

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2013-12-23 12:44:13 +0000
+++ hr_payroll/hr_payroll.py	2014-04-02 08:30:41 +0000
@@ -578,7 +578,7 @@
         payslip_obj = Payslips(self.pool, cr, uid, payslip.employee_id.id, payslip)
         rules_obj = BrowsableObject(self.pool, cr, uid, payslip.employee_id.id, rules)
 
-        localdict = {'categories': categories_obj, 'rules': rules_obj, 'payslip': payslip_obj, 'worked_days': worked_days_obj, 'inputs': input_obj}
+        baselocaldict = {'categories': categories_obj, 'rules': rules_obj, 'payslip': payslip_obj, 'worked_days': worked_days_obj, 'inputs': input_obj}
         #get the ids of the structures on the contracts and their parent id as well
         structure_ids = self.pool.get('hr.contract').get_all_structures(cr, uid, contract_ids, context=context)
         #get the rules of the structure and thier children
@@ -588,11 +588,12 @@
 
         for contract in self.pool.get('hr.contract').browse(cr, uid, contract_ids, context=context):
             employee = contract.employee_id
-            localdict.update({'employee': employee, 'contract': contract})
+            localdict = dict(baselocaldict, employee=employee, contract=contract)
             for rule in obj_rule.browse(cr, uid, sorted_rule_ids, context=context):
                 key = rule.code + '-' + str(contract.id)
                 localdict['result'] = None
                 localdict['result_qty'] = 1.0
+                localdict['result_rate'] = 100
                 #check if the rule can be applied
                 if obj_rule.satisfy_condition(cr, uid, rule.id, localdict, context=context) and rule.id not in blacklist:
                     #compute the amount of the rule