From e56a6ef0fbe28911375337f7627d40796713e397 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Tue, 22 Mar 2011 16:33:53 +0530 Subject: [PATCH] [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 --- addons/hr_payroll/hr_payroll.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 749743f2a09..0f04ecb7ca1 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -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())