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

[IMP] hr_payroll: improved code to take into account credit_note while calculating the sum 

bzr revid: mtr@mtr-20110511061349-dj6jlpmnhjn13iij
This commit is contained in:
mtr 2011-05-11 11:43:49 +05:30
parent 7f97f2e2b3
commit 4058da5295
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/hr_payroll/hr_payroll.py
View File

@ -619,13 +619,18 @@ class hr_payslip(osv.osv):
context = {}
if to_date is None:
to_date = datetime.now().strftime('%Y-%m-%d')
cr.execute("SELECT sum(pl.total) \
sum = 0.0
cr.execute("SELECT pl.total, hp.credit_note\
FROM hr_payslip as hp, hr_payslip_line as pl \
WHERE hp.employee_id = %s AND hp.state in ('confirm','done') \
AND hp.date_from >= %s AND hp.date_to <= %s AND hp.id = pl.slip_id AND pl.code = %s",
(employee, from_date, to_date, code))
res = cr.fetchone()
return res and res[0] or 0.0
for r in cr.dictfetchall():
if r['credit_note'] == False:
sum += r['total']
else:
sum -= r['total']
return sum
hr_payslip()