From 3f842e091a571fed695a23883265f9249d851a30 Mon Sep 17 00:00:00 2001 From: "fefe.clochette" Date: Mon, 30 Mar 2026 10:26:43 +0200 Subject: [PATCH] =?UTF-8?q?charge=20=C3=A0=20venir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/budget/views/suivi.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/budget/views/suivi.php b/modules/budget/views/suivi.php index 54860f5..bd132d1 100644 --- a/modules/budget/views/suivi.php +++ b/modules/budget/views/suivi.php @@ -286,8 +286,7 @@ foreach ($allExpenses as $exp) { } } -// CORRECTION BUG N°1 : On calcule et on ajoute l'école aux charges à venir AVANT la condition de clôture -// Ainsi, le détail de l'école sera toujours affiché dans le petit 👁️ +// 1. École $ecole_depense = isset($totals['School']) ? $totals['School'] : 0; $reste_ecole = max(0, $budget_school - $ecole_depense); if ($reste_ecole > 0) { @@ -295,6 +294,22 @@ if ($reste_ecole > 0) { $pending_charges[] = ['name' => 'École (Reste estimé)', 'amount' => $reste_ecole]; } +// 2. Courses (FMCG) +$fmcg_depense = isset($totals['FMCG']) ? $totals['FMCG'] : 0; +$reste_fmcg = max(0, $budget_fmcg - $fmcg_depense); +if ($reste_fmcg > 0) { + $reste_a_venir_calc += $reste_fmcg; + $pending_charges[] = ['name' => 'Courses (Reste estimé)', 'amount' => $reste_fmcg]; +} + +// 3. Essence +$essence_depense = isset($totals['Essence']) ? $totals['Essence'] : 0; +$reste_essence = max(0, $budget_essence - $essence_depense); +if ($reste_essence > 0) { + $reste_a_venir_calc += $reste_essence; + $pending_charges[] = ['name' => 'Essence (Reste estimé)', 'amount' => $reste_essence]; +} + // F. Calculs des KPIs finaux $rentrees_salaires_reels = $totals['Income'] ?? 0; $rentrees_autres = $total_rentrees - $rentrees_salaires_reels;