From 76d69b1000361255bdfc43548ae1a71b04dad9de Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 17 May 2012 17:10:15 +0530 Subject: [PATCH] salary register issue fixed --- .../salary_register/salary_register.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/erpnext/hr/search_criteria/salary_register/salary_register.py b/erpnext/hr/search_criteria/salary_register/salary_register.py index 9b9d5d4a9b..f237ad7137 100644 --- a/erpnext/hr/search_criteria/salary_register/salary_register.py +++ b/erpnext/hr/search_criteria/salary_register/salary_register.py @@ -19,13 +19,14 @@ for r in res: if not sal_slips_ids == '': sal_slips_ids +="," sal_slips_ids+="'%s'"%r[col_idx['ID']] -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)] +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)] + ded_heads =[i[0] for i in sql("select distinct d_type from `tabSalary Slip Deduction` where parent in (%s)"%sal_slips_ids)] col=[] - for e in earn_heads: - l = (len(e)*9) + l = (len(cstr(e))*9) if l < 150 : col_width = '150px' else: @@ -35,7 +36,6 @@ for e in earn_heads: col.append(['Arrear Amount','Currency','150px','']) col.append(['Encashment Amount','Currency','170px','']) col.append(['Gross Pay','Currency','150px','']) - for d in ded_heads: l = (len(d)*9) if l < 150 : col_width = '150px' @@ -54,7 +54,6 @@ for c in col: grand_tot = 0 for r in res: - for i in range(6,len(colnames)): 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])) @@ -65,7 +64,6 @@ for r in res: else: 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 = tot and flt(tot[0][0]) or 0 if colnames[i] == 'Net Pay': @@ -75,4 +73,4 @@ for r in res: gt_row = ['' for i in range(len(colnames))] gt_row[col_idx['Employee Name']] = 'Grand Totals' gt_row[col_idx['Net Pay']-1] = fmt_money(grand_tot) -res.append(gt_row) +res.append(gt_row) \ No newline at end of file