odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]l10n_in_hr_payroll:variable name changed 

bzr revid: kbh@tinyerp.com-20120724130149-7foqh69oevgzwd9s
This commit is contained in:
Khushboo Bhatt (Open ERP) 2012-07-24 18:31:49 +05:30
parent d0827a266b
commit 7e6d5474f4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
View File

@ -81,8 +81,8 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
left join resource_resource as r on r.id = emp.resource_id \
where pl.code = 'NET' and p.state = 'done' and p.employee_id in %s \
group by r.name, p.date_to,emp.id",(tuple([emp_id]),))
salary = self.cr.fetchall()
salary1 = dict(salary)
sal = self.cr.fetchall()
salary = dict(sal)
total = 0.0
total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
cnt = 1
@ -90,10 +90,10 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
if month <> 'None':
if len(month) != 7:
month = '0' + str(month)
if month in salary1 and salary1[month]:
emp_salary.append(salary1[month])
total += salary1[month]
total_mnths[cnt] = total_mnths[cnt] + salary1[month]
if month in salary and salary[month]:
emp_salary.append(salary[month])
total += salary[month]
total_mnths[cnt] = total_mnths[cnt] + salary[month]
else:
emp_salary.append(0.00)
else: