Diverse wijzigingen

application/models/eloquent/Employeetarget.php

@@ -56,7 +56,9 @@ class Employeetarget extends BaseModel {
 
         if( $monthTarget->count() == 0 ) return 0;
 
-        return $monthTarget->first()->target;
+        $monthtarget =  $monthTarget->first();
+
+        return $monthtarget->target;
     }
 
 }

application/models/eloquent/Vat.php

@@ -27,4 +27,13 @@ class Vat extends BaseModel {
         return $vats;
     }
 
+    public static function getCurrentVat()
+    {
+        $currentVat = Vat::whereActive('T')->whereArchive('F')->first();
+
+        if( ! $currentVat) return 0;
+
+        return $currentVat->vatrate;
+    }
+
 }

application/models/projects/Invoices_model.php

@@ -27,22 +27,28 @@ class Invoices_model extends MY_Model {
     public function getOutstandingPerProject( $projectID )
     {
         $this->sql = "
-        SELECT 		(own_revenue + other_revenue) AS totalrevenue,
-                    ROUND(SUM(INV.invoiceamount * ((100 + vatrate) / 100)), 0) AS totalinvoiced,
-                    SUM(payed) AS payed
-        FROM 		  invoices 	    INV
-            JOIN 	  projects	    PRJ
-            ON		  PRJ.id = INV.project_id
-            JOIN      vats          VTS
-            ON        VTS.id = INV.vat_id
-            JOIN	  offers		OFF
-            ON 		  PRJ.id = OFF.project_id
-            LEFT JOIN (
-                      SELECT        SUM(paymentamount) payed, invoice_id
-                      FROM          payments
-                      ) PAY
-            ON        INV.id = PAY.invoice_id
-        WHERE 		PRJ.id = {$projectID} ";
+         SELECT 		(own_revenue + other_revenue) AS totalrevenue,
+                        ROUND(SUM(INV.invoiceamount * ((100 + vatrate) / 100)), 0) AS totalinvoiced,
+                        (
+                      	SELECT        SUM(paymentamount) PAYMENTAMOUNT
+                      	FROM          payments		PAY
+                      		JOIN 	  invoices 		INV
+                      		ON 		  INV.id = PAY.invoice_id
+                      	WHERE 		  INV.project_id = {$projectID} 
+                      	) AS payed        
+        FROM 		  	invoices 	    INV
+            JOIN 	  	projects	    PRJ
+            ON		  	PRJ.id = INV.project_id
+            JOIN      	(
+            			SELECT 	vatrate, id
+            			FROM	vats
+            			WHERE	active = 'T'
+            				AND	archive = 'F'
+            			) VTS
+            ON        	VTS.id = INV.vat_id
+            JOIN	  	offers		OFF
+            ON 		  	PRJ.id = OFF.project_id
+        WHERE 		    PRJ.id = {$projectID} ";
 
         $invoiceDetails = $this->get_query_row();