From 5948892b93001bdb87a45b081f43b8254b6829c2 Mon Sep 17 00:00:00 2001 From: Theo Weijmer Date: Thu, 31 Oct 2019 14:14:50 +0100 Subject: [PATCH] merge --- .../models/eloquent/queries/QinvoiceMonthOverview.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/models/eloquent/queries/QinvoiceMonthOverview.php b/application/models/eloquent/queries/QinvoiceMonthOverview.php index 1816b7d..b5d167f 100644 --- a/application/models/eloquent/queries/QinvoiceMonthOverview.php +++ b/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 @@ -33,8 +33,8 @@ class QinvoiceMonthOverview { GROUP BY month_id ) AS PAY ON MNT.id = PAY.month_id - LEFT JOIN projects PRJ - GROUP BY MNT.id + JOIN projects PRJ + GROUP BY MNT.id ORDER BY MNT.id "; return $sql;