| commit | 0c67f999611ed655f2e6f941bf285105ffc63cee | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Wed Mar 06 18:51:18 2013 +0530 |
| committer | Nabin Hait <nabinhait@gmail.com> | Wed Mar 06 18:51:18 2013 +0530 |
| tree | a6576dc7cf1b4adaf858b2f0d60d203e6b5c0ed2 | |
| parent | a72c5127a6b6c1a285a2e5a0b374bf468eb1c0c6 [diff] | |
| parent | 4244b3b267edd91777ec5a60f4da863e1a37c5f0 [diff] |
Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/hr/search_criteria/monthly_salary_register/monthly_salary_register.py b/hr/search_criteria/monthly_salary_register/monthly_salary_register.py index 5171aa4..2291b66 100644 --- a/hr/search_criteria/monthly_salary_register/monthly_salary_register.py +++ b/hr/search_criteria/monthly_salary_register/monthly_salary_register.py
@@ -38,8 +38,8 @@ for r in res: - total_lwp += r[col_idx['Leave Without Pay']] - total_arr += r[col_idx['Arrear Amount']] + total_lwp += flt(r[col_idx['Leave Without Pay']]) + total_arr += flt(r[col_idx['Arrear Amount']]) for d1 in li: d2 = '%s'%d1