From 29f341b052360dd7cb8af68629aa91860c3401a4 Mon Sep 17 00:00:00 2001 From: "fefe.clochette" Date: Wed, 6 May 2026 21:46:03 +0200 Subject: [PATCH] fix calcul voyage --- modules/holidays/views/detail.php | 2 +- modules/holidays/views/list.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/holidays/views/detail.php b/modules/holidays/views/detail.php index e6adb78..a867fec 100644 --- a/modules/holidays/views/detail.php +++ b/modules/holidays/views/detail.php @@ -12,7 +12,7 @@ if ($id === 0) { $stmt = $pdo->prepare(" SELECT h.*, (COALESCE(h.budget_food, 0) + 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) + (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_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 WHERE h.id = ? "); diff --git a/modules/holidays/views/list.php b/modules/holidays/views/list.php index 5983e8c..2a02bfa 100644 --- a/modules/holidays/views/list.php +++ b/modules/holidays/views/list.php @@ -22,8 +22,7 @@ if ($selectedYear !== 'all') { $sql = " SELECT h.*, (COALESCE(h.budget_food, 0) + COALESCE(h.budget_extra, 0) + COALESCE(SUM(hi.amount), 0)) as total_cost, - ((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_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 LEFT JOIN pf_holidays_items hi ON h.id = hi.holiday_id