Overigen/dbois
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
theo
2019-10-31 14:14:50 +01:00
parent e0029b3d53
commit 5948892b93
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/eloquent/queries/QinvoiceMonthOverview.php
+3 -3
View File
@@ -10,7 +10,7 @@ class QinvoiceMonthOverview {
public static function fire( $projectID, $year ) public static function fire( $projectID, $year )
{ {
$sql = "SELECT MNT.id, $sql = "SELECT MNT.id,
month, month,
COALESCE(forecastamount, 0) AS forecastamount, COALESCE(forecastamount, 0) AS forecastamount,
COALESCE(paymentamount, 0) AS paymentamount COALESCE(paymentamount, 0) AS paymentamount
@@ -33,8 +33,8 @@ class QinvoiceMonthOverview {
GROUP BY month_id GROUP BY month_id
) AS PAY ) AS PAY
ON MNT.id = PAY.month_id ON MNT.id = PAY.month_id
LEFT JOIN projects PRJ JOIN projects PRJ
GROUP BY MNT.id GROUP BY MNT.id
ORDER BY MNT.id "; ORDER BY MNT.id ";
return $sql; return $sql;