From a65d0b7debb6b5bc09c8dd245dc228c26be8eff1 Mon Sep 17 00:00:00 2001 From: Theo Weijmer Date: Fri, 1 Mar 2019 15:15:43 +0100 Subject: [PATCH] fix for urenreport --- application/models/eloquent/queries/QEmployeeHours.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/application/models/eloquent/queries/QEmployeeHours.php b/application/models/eloquent/queries/QEmployeeHours.php index 69ea245..c57e858 100644 --- a/application/models/eloquent/queries/QEmployeeHours.php +++ b/application/models/eloquent/queries/QEmployeeHours.php @@ -45,7 +45,8 @@ class QEmployeeHours { FROM projecthours PH JOIN projectemployees PEM ON PEM.id = PH.projectemployee_id - WHERE YEAR(hourdate) = '{$year}' "; + WHERE YEAR(hourdate) = '{$year}' + AND hourtype_id = 2 "; if( $month != 0 ) $sql .= "AND MONTH(hourdate) = '$month' "; $sql .= " GROUP BY PEM.user_id, MONTH(hourdate) @@ -58,7 +59,8 @@ class QEmployeeHours { 0 AS revenues, 0 AS nonprojecthours FROM projecthours PH - WHERE YEAR(hourdate) = '{$year}' "; + WHERE YEAR(hourdate) = '{$year}' + AND hourtype_id = 3 "; if( $month != 0 ) $sql .= "AND MONTH(hourdate) = '$month' "; $sql .= " GROUP BY PH.projectemployee_id, MONTH(hourdate)