diff --git a/application/models/eloquent/queries/Qinvoiceoverview.php b/application/models/eloquent/queries/Qinvoiceoverview.php index e2dd8f2..17a161b 100644 --- a/application/models/eloquent/queries/Qinvoiceoverview.php +++ b/application/models/eloquent/queries/Qinvoiceoverview.php @@ -16,8 +16,8 @@ class Qinvoiceoverview { PRJ.projectname, (own_revenue + other_revenue ) AS revenues, CUS.name AS customername, - SUM(IF( YEAR(invoicedate) = {$year}, invoiceamount* ((100 + vts.vatrate)/100), 0)) AS currentyear, - SUM(IF( YEAR(invoicedate) != {$year}, invoiceamount * ((100 + vts.vatrate)/100), 0)) AS otheryear, + SUM(IF( YEAR(invoicedate) = {$year}, invoiceamount* ((100 + VTS.vatrate)/100), 0)) AS currentyear, + SUM(IF( YEAR(invoicedate) != {$year}, invoiceamount * ((100 + VTS.vatrate)/100), 0)) AS otheryear, SUM(COALESCE(Q1.currentyearpayed, 0)) AS currentyearpayed, SUM(COALESCE(Q1.otheryearpayed, 0)) AS otheryearpayed, CONCAT(firstname, ' ', middlename, ' ', lastname) AS fullname,