Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes in salary register report

Browse Source
This commit is contained in:
Nabin Hait 2013-02-01 18:13:54 +05:30
parent 9159786d35
commit 2bbb385acf
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
hr/search_criteria/salary_register/salary_register.py
View File

@ -8,70 +8,70 @@
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import unicode_literals from __future__ import unicode_literals
sal_slips_ids = '' sal_slips_ids = ''
for r in res: 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 = [], [] earn_heads, ded_heads = [], []
if res: 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(cstr(e))*9) l = (len(cstr(e))*9)
if l < 150 : if l < 150 :
col_width = '150px' col_width = '150px'
else: else:
col_width = '%spx'%(l) col_width = '%spx'%(l)
col.append([e,'Currency',col_width,'']) col.append([e,'Currency',col_width,''])
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(cstr(d))*9) l = (len(cstr(d))*9)
if l < 150 : col_width = '150px' if l < 150 : col_width = '150px'
else: col_width = '%spx'%(l) else: col_width = '%spx'%(l)
col.append([d,'Currency',col_width,'']) col.append([d,'Currency',col_width,''])
col.append(['Total Deduction','Currency','150px','']) col.append(['Total Deduction','Currency','150px',''])
col.append(['Net Pay','Currency','150px','']) col.append(['Net Pay','Currency','150px',''])
for c in col: for c in col:
colnames.append(c[0]) colnames.append(c[0])
coltypes.append(c[1]) coltypes.append(c[1])
colwidths.append(c[2]) colwidths.append(c[2])
coloptions.append(c[3]) coloptions.append(c[3])
col_idx[c[0]] = len(colnames) col_idx[c[0]] = len(colnames)
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]))
if not amt: if not amt:
amt = sql("select d_modified_amount from `tabSalary Slip Deduction` where d_type = '%s' and parent = '%s'"%(colnames[i],r[0])) amt = sql("select d_modified_amount from `tabSalary Slip Deduction` where d_type = '%s' and parent = '%s'"%(colnames[i],r[0]))
amt = amt and amt[0][0] or 0 amt = amt and amt[0][0] or 0
r.append(flt(amt)) r.append(flt(amt))
else: else:
fld_nm = cstr(colnames[i]).lower().replace(' ','_') fld_nm = cstr(colnames[i]).lower().replace(' ','_')
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':
grand_tot += tot grand_tot += tot
r.append(tot) r.append(tot)
gt_row = ['' for i in range(len(colnames))] gt_row = ['' for i in range(len(colnames))]
gt_row[col_idx['Employee Name']] = '<b>Grand Totals</b>' gt_row[col_idx['Employee Name']] = '<b>Grand Totals</b>'
gt_row[col_idx['Net Pay']-1] = fmt_money(grand_tot) gt_row[col_idx['Net Pay']-1] = grand_tot
res.append(gt_row) res.append(gt_row)