visibility offres at timewriting

This commit is contained in:
2019-04-15 14:26:05 +02:00
parent 0a891af5ec
commit d3dd500248
2 changed files with 4 additions and 3 deletions
+2 -2
View File
@@ -47,8 +47,8 @@ class Offer extends BaseModel {
public static function getOffersWithoutProject( )
{
$offersWithoutProject = Offer::orderBy('startdate')
->whereNull('rejectdate')
->whereNull('project_id')
// ->whereNull('rejectdate')
// ->whereNull('project_id')
->whereArchive('F')
->get();
@@ -25,7 +25,8 @@ class EmployeehoursMonthly {
JOIN users USR
ON USR.id = EMH.employee_id
WHERE MONTH(hourdate) = {$month}
AND YEAR(hourdate) = {$year} ";
AND YEAR(hourdate) = {$year}
AND reportable = 'T' ";
if( $employeeID != 0 ) $sql.="AND USR.id = {$employeeID} ";
$sql.="
UNION