Merge conflict
This commit is contained in:
@@ -33,11 +33,11 @@ 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
|
||||||
JOIN projects PRJ
|
LEFT JOIN projects PRJ
|
||||||
GROUP BY MNT.id
|
GROUP BY MNT.id
|
||||||
ORDER BY MNT.id ";
|
ORDER BY MNT.id ";
|
||||||
|
|
||||||
return $sql;
|
return $sql;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user