From a71a7096d6997f1e654c27ffb33f0c4cd343e930 Mon Sep 17 00:00:00 2001 From: Theo Weijmer Date: Fri, 1 Mar 2019 15:49:43 +0100 Subject: [PATCH] fix 2 --- application/models/eloquent/queries/QEmployeeHours.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/eloquent/queries/QEmployeeHours.php b/application/models/eloquent/queries/QEmployeeHours.php index c57e858..fc2b335 100644 --- a/application/models/eloquent/queries/QEmployeeHours.php +++ b/application/models/eloquent/queries/QEmployeeHours.php @@ -46,7 +46,7 @@ class QEmployeeHours { JOIN projectemployees PEM ON PEM.id = PH.projectemployee_id WHERE YEAR(hourdate) = '{$year}' - AND hourtype_id = 2 "; + AND hourtype_id <= 2 "; if( $month != 0 ) $sql .= "AND MONTH(hourdate) = '$month' "; $sql .= " GROUP BY PEM.user_id, MONTH(hourdate)