reservations sdjusted

This commit is contained in:
2019-10-07 19:45:42 +02:00
parent 6f21ab10de
commit 92a460f0ff
5 changed files with 28 additions and 14 deletions
@@ -11,10 +11,11 @@ class ReservationTotals {
public static function fire()
{
// UNION ALL wordt gebruikt voor een full outer join
$sql = "SELECT Q5.project_id AS projectID, external_id AS externalID,
fromreservation,
Q5.costs, reservation, payed, (reservation - fromreservation) AS saldo,
(Q5.costs - payed) AS saldoToPay, PRJ.projectnumber, EXT.contactperson,
$sql = " SELECT PRJ.id AS projectID, external_id AS externalID,
COALESCE(fromreservation, 0) AS fromreservation,
COALESCE(Q5.costs, 0) AS costs, COALESCE(reservation, 0) AS reservation,
COALESCE(payed, 0) AS payed, (COALESCE(reservation, 0) - COALESCE(fromreservation, 0)) AS saldo,
(COALESCE(Q5.costs, 0) - COALESCE(payed, 0)) AS saldoToPay, PRJ.projectnumber, EXT.contactperson,
ROUND(( (OFF.costs * (100 + (SELECT vatrate
FROM vats VTS
JOIN projects P
@@ -52,12 +53,14 @@ class ReservationTotals {
ON Q3.external_id = Q4.external_id AND Q3.project_id = Q4.project_id
WHERE Q4.id IS NULL
) Q5
JOIN projects PRJ
RIGHT JOIN projects PRJ
ON PRJ.id = Q5.project_id
JOIN externals EXT
ON EXT.id = Q5.external_id
JOIN offers OFF
ON PRJ.id = OFF.project_id ";
LEFT JOIN offers OFF
ON PRJ.id = OFF.project_id
LEFT JOIN externals EXT
ON EXT.id = Q5.external_id
WHERE OFF.costs > 0
AND PRJ.archive = 'F'";
return $sql;
}