perco/HouseHub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

charge à venir

Browse Source
This commit is contained in:
FeFeClochette
2026-03-30 10:26:43 +02:00
parent aeb33930ab
commit 3f842e091a
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/budget/views/suivi.php
+17 -2
View File
@@ -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 // 1. École
// Ainsi, le détail de l'école sera toujours affiché dans le petit 👁️
$ecole_depense = isset($totals['School']) ? $totals['School'] : 0; $ecole_depense = isset($totals['School']) ? $totals['School'] : 0;
$reste_ecole = max(0, $budget_school - $ecole_depense); $reste_ecole = max(0, $budget_school - $ecole_depense);
if ($reste_ecole > 0) { if ($reste_ecole > 0) {
@@ -295,6 +294,22 @@ if ($reste_ecole > 0) {
$pending_charges[] = ['name' => 'École (Reste estimé)', 'amount' => $reste_ecole]; $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 // F. Calculs des KPIs finaux
$rentrees_salaires_reels = $totals['Income'] ?? 0; $rentrees_salaires_reels = $totals['Income'] ?? 0;
$rentrees_autres = $total_rentrees - $rentrees_salaires_reels; $rentrees_autres = $total_rentrees - $rentrees_salaires_reels;