merge
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user