| commit | ec4673ac761194f114c44bf035f9c138e271b882 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@erpnext.com> | Wed Mar 06 16:56:45 2013 +0530 |
| committer | Anand Doshi <anand@erpnext.com> | Wed Mar 06 16:56:45 2013 +0530 |
| tree | ceaa305bfcf98e7de58fd7f1585c755c78b73514 | |
| parent | c2429bb1dc5dbcf1134a64771ce1e2eae217abb8 [diff] | |
| parent | 4244b3b267edd91777ec5a60f4da863e1a37c5f0 [diff] |
Merge branch 'master' into edge
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