Merge branch 'master' of bitbucket.org:pensare/dbois

# Conflicts:
#	application/controllers/projects/EmployeeHoursController.php
#	application/views/pages/employeehours_view.php
#	public/js/lib/modules/projects/employeehoursModule.js

application/models/projects/Invoices_model.php

@@ -23,4 +23,20 @@ class Invoices_model extends MY_Model {
 
         return $invoiced;
     }
+
+    public function getOutstandingPerProject( $projectID )
+    {
+        $this->sql = "
+        SELECT 		(own_revenue + other_revenue) - SUM(INV.invoiceamount) AS outstanding
+        FROM 		invoices 	INV
+            JOIN 	projects	PRJ
+            ON		PRJ.id = INV.project_id
+            JOIN	offers		OFF
+            ON 		PRJ.id = OFF.project_id
+        WHERE 		PRJ.id = {$projectID} ";
+
+        $invoiced = $this->get_query_row( 'outstanding' );
+
+        return $invoiced;
+    }
 }