nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-15 09:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

hr reports cleanup

Browse Source
This commit is contained in:
Nabin Hait
2012-04-16 12:31:36 +05:30
parent dbffc2d8d0
commit eaf8b91402
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.py
View File

@@ -43,8 +43,8 @@ for r in res:
for d1 in li:
d2 = '%s'%d1
earn_ret=convert_to_lists(sql("select e_type,e_amount from `tabSS Earning Detail` where parent = '%s'"%r[col_idx['ID']]))
ded_ret=convert_to_lists(sql("select d_type,d_amount from `tabSS Deduction Detail` where parent = '%s'"%r[col_idx['ID']]))
earn_ret=convert_to_lists(sql("select e_type,e_amount from `tabSalary Slip Earning` where parent = '%s'"%r[col_idx['ID']]))
ded_ret=convert_to_lists(sql("select d_type,d_amount from `tabSalary Slip Deduction` where parent = '%s'"%r[col_idx['ID']]))
for e in earn_ret:
@@ -78,7 +78,7 @@ for lst in earn_type_lst:
for r in res:
lst0 = '%s'%lst[0]
total_ear += r[col_idx[lst0]]
total_ear += flt(r[col_idx[lst0]])
total.append(total_ear)
@@ -87,7 +87,7 @@ for lst in ded_type_lst:
total_ded = 0
for r in res:
lst0 = '%s'%lst[0]
total_ded += r[col_idx[lst0]]
total_ded += flt(r[col_idx[lst0]])
total.append(total_ded)