notes voyage

2026-04-01 21:18:18 +02:00
parent 73676bc20a
commit ebfa0c99f3
4 changed files with 66 additions and 33 deletions
@@ -29,7 +29,10 @@ $sql = "
             COALESCE(h.budget_extra, 0) + 
             COALESCE((SELECT SUM(amount) FROM pf_holidays_items WHERE holiday_id = h.id), 0)
           ) as total_cost,
-           (SELECT COALESCE(SUM(ABS(amount)), 0) FROM pf_expenses WHERE holiday_id = h.id) as total_paid,
+           (
+               (SELECT COALESCE(SUM(ABS(amount)), 0) FROM pf_expenses WHERE holiday_id = h.id) +
+               (SELECT COALESCE(SUM(amount), 0) FROM pf_holidays_items WHERE holiday_id = h.id AND is_paid = 1)
+           ) as total_paid,
           (SELECT COALESCE(SUM(amount), 0) FROM pf_savings WHERE holiday_id = h.id) as total_saved
    FROM pf_holidays h
    $whereSQL