Merge lp:~openerp-dev/openobject-addons/trunk-bug-1089600-dhr into lp:openobject-addons

[Dharti Ratani(OpenERP)]

Hello,

     Changed the code for leave types in salary rule to be able to calculate worked days without error.

Thanks.
dhr

[lp:~openerp-dev/openobject-addons/trunk-bug-1089600-dhr]

8490. By Dharti Ratani(OpenERP) on 2013-01-18

[MERGE]merged with trunk

8491. By Dharti Ratani(OpenERP) on 2013-01-18

[IMP]Converted leave type to lower case

[Ajay Patel (OpenERP) (ajay-openerp)]

Hello,

Can't adopt the proposed fix as it forces user to perform pythonic operation (like you did in code .replace) in **Leave Types** names if user leave calculation on Salary Slip. When we define salary rules and we choose python code and put some python code this solution make user force to converstation and create some rule and afterwards if leave rule name get change or Even if installtion other language and leave type get translated the Salary Slip calculation stop wroking :( not good.

For now current code which is keeping smiller names will keep easier to configure for end user(not sure good).
Rather we need more concrete and user friendly solution for this some code based calculation.

For now rejecting the MP.
--
Thank You
Amit Patel

review: Disapprove

Unmerged revisions

8491. By Dharti Ratani(OpenERP) on 2013-01-18

[IMP]Converted leave type to lower case

8490. By Dharti Ratani(OpenERP) on 2013-01-18

[MERGE]merged with trunk

8489. By Dharti Ratani(OpenERP) on 2013-01-02

[FIX]By default taking code in worked days in payslip with '_' by replacing with ' ' as salary rules are not working if there is any space in code

=== 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-01-18 09:09:23 +0000
@@ -441,6 +441,7 @@
                     #the employee had to work
                     leave_type = was_on_leave(contract.employee_id.id, day_from + timedelta(days=day), context=context)
                     if leave_type:
+                        leave_type = leave_type.replace(' ','_').lower()
                         #if he was on leave, fill the leaves dict
                         if leave_type in leaves:
                             leaves[leave_type]['number_of_days'] += 1.0