Merge branch 'master' into feature/dashboard

# Conflicts:
#	application/models/eloquent/Projectemployee.php

application/models/eloquent/Invoice.php

@@ -62,4 +62,16 @@ class Invoice extends BaseModel {
 
         return $invoiceID;
     }
-}
+
+	public static function getInvoiced( $year )
+	{
+		$invoiced = Invoice::selectRaw('invoicenumber, PRJ.projectname, projectnumber, CUS.name, invoicedate, CUS.name, invoiceamount')
+			->join('projects AS PRJ', 'PRJ.id', '=', 'invoices.project_id')
+			->join('customers AS CUS', 'CUS.id', '=', 'PRJ.customer_id')
+			->whereRaw("DATE_FORMAT(invoicedate, '%Y') = {$year}")
+			->orderBy('invoicedate')
+			->get();
+
+		return $invoiced;
+    }
+}

application/models/eloquent/Payment.php

@@ -28,6 +28,17 @@ class Payment extends BaseModel {
         return $projectPayment->payment;
     }
 
+	public static function getProjectsWithPayments($year)
+	{
+		$projects = self::selectRaw('INV.project_id')
+			->distinct()
+			->join('invoices AS INV', 'INV.id', '=', 'payments.invoice_id')
+			->whereRaw('DATE_FORMAT(INV.invoicedate, "%Y") = "'. $year.'"')
+			->lists('project_id');
+
+		return $projects->toArray();
+    }
+
     public static function savePayment( $paymentID, $payment )
     {
         $payment = (array) $payment;
@@ -50,4 +61,4 @@ class Payment extends BaseModel {
         Payment::whereId( $paymentID )->delete();
     }
 
-}
+}

application/models/eloquent/Project.php

@@ -96,7 +96,7 @@ class Project extends BaseModel {
 		Project::whereId( $projectID )->delete();
 	}
 
-	public static function getActiveProjects( $archive = 'T' )
+	public static function getActiveProjects( $archive = 'T', $sortField = FALSE, $direction = FALSE )
 	{
 		$projects = Project::selectRaw( "projects.id, YEAR(projects.startdate) AS instroom, YEAR(projects.enddate) AS uitstroom, projectnumber, current_financial_year,
             projectname, CUS.name, OFF.own_revenue, OFF.other_revenue" )
@@ -106,6 +106,8 @@ class Project extends BaseModel {
 			->groupBy( 'OFF.own_revenue' )
 			->groupBy( 'OFF.other_revenue' );
 
+		if ( $sortField ) $projects = $projects->orderBy( $sortField, $direction );
+
 		if ( $archive == 'F' ) $projects = $projects->where( 'projects.archive', '=', 'F' );
 
 		$projects = $projects->get();
@@ -113,12 +115,14 @@ class Project extends BaseModel {
 		return $projects;
 	}
 
-	public static function getProjectsForReport( $orderType, $orderDirection, $archive = 'F' )
+	public static function getProjectsForReport( $orderType, $orderDirection, $archive = 'F', $projectsArray = FALSE )
 	{
 		$projects = self::getBaseProject();
 
 		if ( $archive == 'F' ) $projects = $projects->whereArchive( 'F' );
 
+		if ( is_array( $projectsArray ) ) $projects = $projects->whereIn( 'id', $projectsArray );
+
 		$projects = $projects->orderBy( $orderType, $orderDirection )->get();
 
 		return $projects;

application/models/eloquent/queries/QEmployeeHours.php

@@ -77,4 +77,4 @@ class QEmployeeHours {
     }
 
 
-}
+}

application/models/eloquent/queries/QinvoiceMonthOverview.php

@@ -10,7 +10,7 @@ class QinvoiceMonthOverview {
 
     public static function fire( $projectID, $year )
     {
-        $sql = "SELECT				MNT.id, 
+        $sql = "SELECT				MNT.id,
                                     month,
                                     COALESCE(forecastamount, 0) AS forecastamount,
                                     COALESCE(paymentamount, 0) AS paymentamount
@@ -34,10 +34,10 @@ class QinvoiceMonthOverview {
                                     ) AS PAY
                     ON 				MNT.id = PAY.month_id
                     LEFT JOIN 		projects   PRJ
-                GROUP BY 			MNT.id 
+                GROUP BY 			MNT.id
                 ORDER BY            MNT.id ";
 
         return $sql;
     }
 
-}
+}

application/models/eloquent/queries/ReservationTotals.php

@@ -11,7 +11,8 @@ class ReservationTotals {
     public static function fire()
     {
         // UNION ALL wordt gebruikt voor een full outer join
-        $sql = "				SELECT		PRJ.id AS projectID, external_id AS externalID, 
+        $sql = "SELECT		PRJ.id AS projectID, external_id AS externalID, 
+							PRJ.projectname,
                             COALESCE(fromreservation, 0) AS fromreservation,
                             COALESCE(Q5.costs, 0) AS costs, COALESCE(reservation, 0) AS reservation, 
                             COALESCE(payed, 0) AS payed, (COALESCE(reservation, 0) - COALESCE(fromreservation, 0)) AS saldo,