Merge conflict
This commit is contained in:
@@ -33,11 +33,11 @@ class QinvoiceMonthOverview {
|
||||
GROUP BY month_id
|
||||
) AS PAY
|
||||
ON MNT.id = PAY.month_id
|
||||
JOIN projects PRJ
|
||||
LEFT JOIN projects PRJ
|
||||
GROUP BY MNT.id
|
||||
ORDER BY MNT.id ";
|
||||
|
||||
return $sql;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user