Removalls and offers revenues

2018-06-10 17:31:05 +02:00
parent 8fe98e6ccb
commit c539d03fb6
20 changed files with 449 additions and 158 deletions
@@ -27,7 +27,7 @@ class Invoices_model extends MY_Model {
    public function getOutstandingPerProject( $projectID )
    {
        $this->sql = "
-         SELECT 		(own_revenue + other_revenue) AS totalrevenue,
+         SELECT 		(own_revenue + other_revenue + OFF.costs) AS totalrevenue,
                        ROUND(SUM(INV.invoiceamount * ((100 + vatrate) / 100)), 0) AS totalinvoiced,
                        (
                      	SELECT        SUM(paymentamount) PAYMENTAMOUNT