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

[IMP] small improvment in _calculate_basic method of hr.employee so it will consider today's contract days to total the basic of employee form all contracts 

bzr revid: psi@tinyerp.co.in-20110322110353-ph0w969grj8ua6l3
This commit is contained in:
psi (Open ERP) 2011-03-22 16:33:53 +05:30
parent 188ca3c715
commit e56a6ef0fb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_payroll/hr_payroll.py
View File

@ -1277,7 +1277,7 @@ class hr_employee(osv.osv):
cr.execute( 'SELECT SUM(wage) '\
'FROM hr_contract '\
'WHERE employee_id = %s '\
'AND date_start < %s '\
'AND date_start <= %s '\
'AND (date_end > %s OR date_end is NULL)',
(employee.id, current_date, current_date))
result = dict(cr.dictfetchone())