CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-01 17:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into edge

Browse Source
This commit is contained in:
Anand Doshi
2013-03-06 16:56:45 +05:30
parent c2429bb1dc 4244b3b267
commit ec4673ac76
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hr/search_criteria/monthly_salary_register/monthly_salary_register.py
View File

@@ -38,8 +38,8 @@ for d in li:
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