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

salary register issue fixed

Browse Source
This commit is contained in:
Nabin Hait
2012-05-17 17:10:15 +05:30
parent 57f9bd1d73
commit 76d69b1000
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,13 +19,14 @@ for r in res:
if not sal_slips_ids == '': sal_slips_ids +="," if not sal_slips_ids == '': sal_slips_ids +=","
sal_slips_ids+="'%s'"%r[col_idx['ID']] sal_slips_ids+="'%s'"%r[col_idx['ID']]
earn_heads, ded_heads = [], []
if res:
earn_heads =[i[0] for i in sql("select distinct e_type from `tabSalary Slip Earning` where parent in (%s)"%sal_slips_ids)] earn_heads =[i[0] for i in sql("select distinct e_type from `tabSalary Slip Earning` where parent in (%s)"%sal_slips_ids)]
ded_heads =[i[0] for i in sql("select distinct d_type from `tabSalary Slip Deduction` where parent in (%s)"%sal_slips_ids)] ded_heads =[i[0] for i in sql("select distinct d_type from `tabSalary Slip Deduction` where parent in (%s)"%sal_slips_ids)]
col=[] col=[]
for e in earn_heads: for e in earn_heads:
l = (len(e)*9) l = (len(cstr(e))*9)
if l < 150 : if l < 150 :
col_width = '150px' col_width = '150px'
else: else:
@@ -35,7 +36,6 @@ for e in earn_heads:
col.append(['Arrear Amount','Currency','150px','']) col.append(['Arrear Amount','Currency','150px',''])
col.append(['Encashment Amount','Currency','170px','']) col.append(['Encashment Amount','Currency','170px',''])
col.append(['Gross Pay','Currency','150px','']) col.append(['Gross Pay','Currency','150px',''])
for d in ded_heads: for d in ded_heads:
l = (len(d)*9) l = (len(d)*9)
if l < 150 : col_width = '150px' if l < 150 : col_width = '150px'
@@ -54,7 +54,6 @@ for c in col:
grand_tot = 0 grand_tot = 0
for r in res: for r in res:
for i in range(6,len(colnames)): for i in range(6,len(colnames)):
if colnames[i] not in ('Arrear Amount','Encashment Amount','Net Pay','Gross Pay','Total Deduction'): if colnames[i] not in ('Arrear Amount','Encashment Amount','Net Pay','Gross Pay','Total Deduction'):
amt = sql("select e_modified_amount from `tabSalary Slip Earning` where e_type = '%s' and parent = '%s'"%(colnames[i],r[0])) amt = sql("select e_modified_amount from `tabSalary Slip Earning` where e_type = '%s' and parent = '%s'"%(colnames[i],r[0]))
@@ -65,7 +64,6 @@ for r in res:
else: else:
fld_nm = cstr(colnames[i]).lower().replace(' ','_') fld_nm = cstr(colnames[i]).lower().replace(' ','_')
errprint(fld_nm)
tot = sql("select %s from `tabSalary Slip` where name ='%s'"%(fld_nm,r[0])) tot = sql("select %s from `tabSalary Slip` where name ='%s'"%(fld_nm,r[0]))
tot = tot and flt(tot[0][0]) or 0 tot = tot and flt(tot[0][0]) or 0
if colnames[i] == 'Net Pay': if colnames[i] == 'Net Pay':