chore: bump version to v0.1.56

feat : modification écran RTT + modification écran frais
chore: bump version to v0.1.55
2026-03-19 16:10:25 +00:00 · 2026-03-19 17:10:11 +01:00 · 2026-03-18 14:40:57 +00:00 · 2026-03-18 15:40:44 +01:00 · 2026-03-18 15:40:31 +01:00 · 2026-03-17 14:24:43 +00:00
63 changed files with 2842 additions and 291 deletions
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -22,7 +22,9 @@
      "Bash(which python3:*)",
      "Bash(sudo apt-get:*)",
      "Bash(npx xlsx-cli:*)",
-      "Bash(cat /home/m-tristan/.claude/projects/-home-m-tristan-workspace-SIRH/4b53d9d7-d8ae-451f-a5cc-5d4fd55f2eef/tool-results/toolu_019hng9Cu2m9wiNACuC2Wm3F.json | python3 -c \"import json,sys; data=json.load\\(sys.stdin\\); print\\(data[0]['text']\\)\" 2>/dev/null | head -2000)"
+      "Bash(cat /home/m-tristan/.claude/projects/-home-m-tristan-workspace-SIRH/4b53d9d7-d8ae-451f-a5cc-5d4fd55f2eef/tool-results/toolu_019hng9Cu2m9wiNACuC2Wm3F.json | python3 -c \"import json,sys; data=json.load\\(sys.stdin\\); print\\(data[0]['text']\\)\" 2>/dev/null | head -2000)",
+      "Bash(pip3 install:*)",
+      "Bash(find:*)"
    ]
  }
 }
--- a/.env
+++ b/.env
@@ -36,6 +36,10 @@ DEFAULT_URI=http://localhost
 DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8"
 ###< doctrine/doctrine-bundle ###

+###> app ###
+RTT_START_DATE=2026-02-23
+###< app ###
+
 ###> nelmio/cors-bundle ###
 CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
 ###< nelmio/cors-bundle ###
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SqlDialectMappings">
+    <file url="file://$PROJECT_DIR$/sirh.sql" dialect="GenericSQL" />
+  </component>
+</project>
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -46,6 +46,11 @@
 - INTERIM: no overtime bonuses, no recovery time
 - Driver contracts: no overtime calculation

+## Frais (MileageAllowance)
+- Onglet "Frais" (anciennement "Frais Kms") sur la fiche employé
+- Validation: mois obligatoire + au moins `kilometers > 0` ou `amount > 0`
+- Les deux champs km et montant sont optionnels individuellement mais au moins un requis
+
 ## Frontend Patterns

 ### Table styling (standard across all pages)
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -26,6 +26,14 @@ services:
        arguments:
            $holidayUrl: '%env(HOLIDAY_URL)%'

+    App\Service\Rtt\RttRecoveryComputationService:
+        arguments:
+            $rttStartDate: '%env(RTT_START_DATE)%'
+
+    App\State\EmployeeRttSummaryProvider:
+        arguments:
+            $rttStartDate: '%env(RTT_START_DATE)%'
+
    App\Repository\Contract\AbsenceReadRepositoryInterface: '@App\Repository\AbsenceRepository'
    App\Repository\Contract\EmployeeContractPeriodReadRepositoryInterface: '@App\Repository\EmployeeContractPeriodRepository'
    App\Repository\Contract\EmployeeScopedRepositoryInterface: '@App\Repository\EmployeeRepository'
--- a/config/version.yaml
+++ b/config/version.yaml
@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.1.39'
+    app.version: '0.1.56'
--- a/doc/functional-rules.md
+++ b/doc/functional-rules.md
@@ -40,6 +40,10 @@ Documents complementaires:

 ## 3) Heures (vue jour)

+- Visibilité des employés:
+  - vue jour: un employé sans contrat à la date sélectionnée est masqué
+  - vue semaine: un employé sans contrat sur aucun jour de la semaine est masqué
+  - même règle pour les heures classiques et les heures conducteurs
 - Saisie par salarié et par date:
  - matin / après-midi / soir
  - pour `PRESENCE`: demi-journées matin/après-midi
@@ -112,6 +116,12 @@ Documents complementaires:
  - contrats >= 39h: de 39h à 43h
 - Tranche 50%:
  - au-delà de 43h
+- Date de début RTT (`RTT_START_DATE` dans `.env`):
+  - les semaines dont la fin est antérieure à cette date sont ignorées dans le calcul de récupération
+  - permet d'éviter les déficits fictifs avant la mise en service du logiciel
+- Semaine en déficit (heures travaillées < heures contrat):
+  - le déficit est déduit du cumul RTT : d'abord des heures à 50%, puis des heures à 25%
+  - si aucun solde 50% ni 25%, les heures à 25% deviennent négatives
 - Nature `INTERIM`:
  - pas de bonus 25%
  - pas de bonus 50%
@@ -124,18 +134,22 @@ Documents complementaires:
 - Colonnes spécifiques (vue jour):
  - Heure de jour (durée HH:MM via TimeSelect)
  - Heure de nuit (durée HH:MM via TimeSelect)
-  - Total (somme jour + nuit, calculé)
+  - Heure atelier (durée HH:MM via TimeSelect)
+  - Total (somme jour + nuit + atelier, calculé)
  - Petit déjeuner (checkbox)
  - Déjeuner (checkbox)
+  - Dîner (checkbox)
  - Nuitée (checkbox)
 - Stockage backend:
-  - `dayHoursMinutes` et `nightHoursMinutes` (entiers, minutes) sur `WorkHour`
-  - `hasBreakfast`, `hasLunch`, `hasOvernight` (booleans) sur `WorkHour`
+  - `dayHoursMinutes`, `nightHoursMinutes` et `workshopHoursMinutes` (entiers, minutes) sur `WorkHour`
+  - `hasBreakfast`, `hasLunch`, `hasDinner`, `hasOvernight` (booleans) sur `WorkHour`
  - les champs time classiques (morning/afternoon/evening) sont mis à null pour les chauffeurs
+- Absences `countAsWorkedHours=true`: les minutes créditées sont ajoutées aux heures de jour (vue jour et vue semaine), même logique que les employés classiques
 - Validation: même logique que les heures classiques (`isValid`, `isSiteValid`, bulk)
 - Vue semaine:
-  - jour/nuit par jour + indicateurs repas/nuitée
-  - totaux hebdo: jour, nuit, total, compteurs petit déj/déjeuner/nuitée
+  - jour/nuit/atelier par jour + indicateurs repas/dîner/nuitée
+  - panier de nuit (PN): affiché par jour si (nightMinutes > dayMinutes) OU (nightMinutes >= 240, soit au moins 4h de travail entre 21h et 6h), et total hebdo dans la colonne Jour/Nuit sem.
+  - totaux hebdo: jour, nuit, atelier, total, compteurs petit déj/déjeuner/dîner/nuitée
  - pas de calcul d'heures supplémentaires pour les conducteurs
 - Le flag `isDriver` est sur `EmployeeContractPeriod` (un employé peut changer de statut chauffeur selon la période)
 - Exposé en API via un getter virtuel sur `Employee` (`employee:read`) qui résout depuis la période active
@@ -168,6 +182,11 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
 - Modification employé:
  - uniquement prénom, nom, site
  - pas de modification de contrat depuis ce drawer
+- Liste employés — filtre par statut de contrat:
+  - 3 options: "Avec contrat" (défaut), "Sans contrat", "Tous"
+  - "Avec contrat": employés ayant une période de contrat active à la date du jour
+  - "Sans contrat": employés sans période de contrat active
+  - "Tous": aucun filtrage sur le contrat
 - Détail employé:
  - onglet `Suivi contrat` avec affichage de l'historique des périodes de contrat
  - chaque ligne expose: nature (`CDI`/`CDD`/`INTERIM`), contrat/temps de travail, date de début, date de fin (ou "En cours")
@@ -193,12 +212,19 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
        - en cours d'acquisition jours: `25/12 = 2,08` jours/mois
        - en cours d'acquisition samedis: `5/12 = 0,42` samedi/mois (non detaille en UI)
        - en cas de début/fin en cours de mois, l'acquisition est proratisée au nombre de jours calendaires couverts dans le mois
+        - en cas de suspension en cours de mois, l'acquisition est proratisée en jours ouvrés (lun-ven hors fériés) travaillés / 22 (standard mensuel)
+        - arrêt maladie long (absences continues de type `M` > 1 mois):
+          - premier mois de maladie (date début + 1 mois calendaire): acquisition normale (`2,50`/mois)
+          - après le premier mois: acquisition réduite à `2,00`/mois (facteur `0,80` appliqué aux deux taux jours et samedis)
+          - en cas de mois partiellement couvert par la période réduite, le prorata est calculé en jours calendaires (jours normaux × taux normal + jours réduits × taux réduit)
+          - la détection est automatique à partir des absences MALADIE consécutives en base (tolérance de gap ≤ 3 jours)
        - samedis acquis affiches: uniquement `opening_saturdays` (report N-1)
      - contrat `4h`:
        - acquis annuel CP: `10`
        - acquis annuel samedi: `0`
        - en cours d'acquisition: `0.83` jour/mois
        - en cas de début/fin en cours de mois, l'acquisition est proratisée au nombre de jours calendaires couverts dans le mois
+        - en cas de suspension en cours de mois, l'acquisition est proratisée en jours ouvrés (lun-ven hors fériés) travaillés / 22
      - contrat `FORFAIT`:
        - base annuelle: `jours ouvrés de l'exercice (lundi-vendredi, hors jours fériés métropole) - 218`
        - prorata: en cas de démarrage/fin de contrat en cours d'année civile, le calcul ne couvre que l'intervalle actif du contrat dans l'année
@@ -248,6 +274,7 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
      - base identique aux calculs d'heures supplémentaires de la vue semaine Heures
      - minutes de récupération hebdomadaires = `HS totales + bonus 25% + bonus 50%`
      - contrats `INTERIM` et suivi `PRESENCE`: récupération à `0`
+      - date limite de calcul: uniquement les semaines terminées (jusqu'au dernier dimanche), **ou** la semaine en cours si tous les jours existants sont validés RH (`isValid = true`). En cas de fin de contrat en milieu de semaine, seuls les jours jusqu'à la date de fin sont vérifiés.
    - compteur global:
      - affiché en **jours** (1 jour = 7h = 420 minutes)
    - report:
@@ -265,10 +292,81 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
      - `rate`: taux de majoration, valeurs `25` ou `50`
      - les heures payées sont soustraites du disponible RTT (`availableMinutes -= totalPaidMinutes`)
      - affichage: 2 lignes par mois dans le tableau (25% et 50%)
+    - colonnes Total 25% et Total 50%: somme base + bonus de chaque tranche
+    - ligne Report N-1 (carry rollover): affichée en juin uniquement si carry > 0
+    - ligne Report mois précédent: solde cumulé (carry N-1 + semaines antérieures − paiements antérieurs), affichée à partir de juillet (masquée si nul)
+    - Reste = Report cumulé + Total du mois − Payé du mois (balance courante en fin de mois)
    - affichage:
      - le compteur global RTT est affiché en **heures** (format `Xh00`)

-## 10) Notifications
+## 10) Export récap. congés & RTT (PDF)
+
+- Accessible depuis la page Employés via le bouton "Export récap. congés" (réservé `ROLE_ADMIN`)
+- Clic direct (pas de drawer), génère un PDF A4 portrait à la date du jour
+- Endpoint: `GET /api/leave-recap/print`
+- Seuls les employés avec contrat actif sont inclus
+- Données groupées par site
+
+### Colonnes du tableau
+
+| Colonne | Logique |
+|---------|---------|
+| Nom | lastName + firstName |
+| Contrat | Contract.name |
+| CP N-1 restant | CDI/CDD: acquis N-1 − pris sur N-1. Forfait: report N-1 restant |
+| Samedi restant | CDI/CDD: samedis acquis N-1 − pris. Forfait: `-` |
+| CP N | Forfait: jours acquis année civile. Non-forfait: en cours d'acquisition |
+| RTT | Minutes disponibles (report N-1 + acquis N - payés). Format `X h Y m`. Forfait et INTERIM: `-` |
+
+## 11) Récapitulatif Salaire (PDF mensuel)
+
+- Accessible depuis la page Employés via le bouton "Récap. Salaire" (réservé `ROLE_ADMIN`)
+- Sélecteur de mois (défaut = mois courant), génère un PDF A3 paysage
+- Endpoint: `GET /api/salary-recap/print?month=YYYY-MM`
+- Données groupées par site, un en-tête par site
+
+### Colonnes du tableau
+
+| Colonne | Source | Logique |
+|---------|--------|---------|
+| Nom | Employee | firstName + lastName |
+| Base | Contract.name | Via EmployeeContractResolver pour le mois |
+| Jour de présence Cadre | WorkHour | Uniquement FORFAIT (PRESENCE). Somme isPresentMorning (0.5) + isPresentAfternoon (0.5) |
+| Heures de nuit | WorkHour | Non-chauffeurs: calcul intervalles nuit (00:00-06:00, 21:00-24:00). Chauffeurs: somme nightHoursMinutes |
+| Panier de nuit | WorkHour | Nombre de jours où (nightMinutes > dayMinutes) OU (nightMinutes >= 240, soit 4h entre 21h-6h) |
+| Heures payés | EmployeeRttPayment | Somme base25Minutes + base50Minutes du mois, convertie en heures |
+| Congés - Nombre | Absence code 'C' | Jours (demi-journées = 0.5) |
+| Congés - Date | Absence code 'C' | Dates formatées dd/mm |
+| Maladie - Nombre | Absence code 'M' ou 'AT' | Jours (demi-journées = 0.5) |
+| Maladie - Date | Absence code 'M' ou 'AT' | Dates formatées dd/mm |
+| CHAUFFEUR - PDJ | WorkHour.hasBreakfast | Comptage mois (chauffeurs uniquement) |
+| CHAUFFEUR - REPAS | WorkHour.hasLunch + hasDinner | Comptage mois (chauffeurs uniquement) |
+| CHAUFFEUR - NUITEE | WorkHour.hasOvernight | Comptage mois (chauffeurs uniquement) |
+| CHAUFFEUR - samedi | WorkHour (samedi) | Samedis travaillés (chauffeurs uniquement) |
+| Observations | — | Colonne vide pour saisie manuelle |
+
+## 12) Frais
+
+- Onglet "Frais" sur la fiche employé (icône `mdi:account-cash-outline`)
+- Entité `MileageAllowance` (table `mileage_allowances`)
+- Champs:
+  - `month` (mois, obligatoire)
+  - `kilometers` (nombre de km, optionnel)
+  - `amount` (montant en €, optionnel)
+  - `comment` (commentaire, optionnel)
+  - `receiptPath` / `receiptName` (justificatif Km, PDF)
+  - `amountReceiptPath` / `amountReceiptName` (justificatif Montant, PDF)
+- Règle de validation:
+  - le mois est obligatoire
+  - au moins un des deux champs `kilometers` ou `amount` doit être > 0
+  - les deux peuvent être remplis simultanément
+- Tableau: colonnes Mois, Nombre de Km, Montant €, Commentaire, Justif. Km, Justif. Montant
+- Deux justificatifs distincts (upload PDF uniquement):
+  - Justificatif Km : upload via `/mileage_allowances/{id}/receipt`, téléchargement via GET même URL
+  - Justificatif Montant : upload via `/mileage_allowances/{id}/amount-receipt`, téléchargement via GET même URL
+- La suppression d'un frais supprime les deux fichiers justificatifs du disque
+
+## 13) Notifications

 - Icône cloche en topbar:
  - badge = nombre de notifications non lues
--- a/frontend/components/SalaryRecapDrawer.vue
+++ b/frontend/components/SalaryRecapDrawer.vue
@@ -0,0 +1,87 @@
+<template>
+    <AppDrawer v-model="drawerOpen" title="Récapitulatif Salaire">
+        <form class="space-y-4" @submit.prevent="handleSubmit">
+            <div>
+                <label class="text-md font-semibold text-neutral-700" for="salary-recap-month">
+                    Mois <span class="text-red-600">*</span>
+                </label>
+                <input
+                    id="salary-recap-month"
+                    v-model="selectedMonth"
+                    type="month"
+                    :class="monthFieldClass"
+                />
+                <p v-if="showMonthError" class="mt-1 text-sm text-red-600">
+                    Le mois est obligatoire.
+                </p>
+            </div>
+
+            <div class="flex justify-center pt-2">
+                <button
+                    type="submit"
+                    class="flex w-[200px] items-center justify-center gap-2 rounded-md bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+                    :class="submitButtonClass"
+                >
+                    Imprimer
+                </button>
+            </div>
+        </form>
+    </AppDrawer>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue'
+import AppDrawer from '~/components/AppDrawer.vue'
+
+const props = defineProps<{
+    modelValue: boolean
+}>()
+
+const emit = defineEmits<{
+    (event: 'update:modelValue', value: boolean): void
+    (event: 'submit', month: string): void
+}>()
+
+const drawerOpen = computed({
+    get: () => props.modelValue,
+    set: (value: boolean) => emit('update:modelValue', value)
+})
+
+const now = new Date()
+const defaultMonth = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}`
+const selectedMonth = ref(defaultMonth)
+const validationTouched = ref(false)
+
+const isMonthValid = computed(() => selectedMonth.value.trim() !== '')
+const showMonthError = computed(() => validationTouched.value && !isMonthValid.value)
+
+const baseInputClass = 'mt-2 w-full rounded-md border px-3 py-2 text-md text-neutral-900'
+const monthFieldClass = computed(() => {
+    if (showMonthError.value) {
+        return `${baseInputClass} border-red-500`
+    }
+    return `${baseInputClass} border-neutral-300`
+})
+
+const submitButtonClass = computed(() => {
+    if (!isMonthValid.value) {
+        return 'opacity-50 cursor-not-allowed'
+    }
+    return ''
+})
+
+const handleSubmit = () => {
+    validationTouched.value = true
+    if (!isMonthValid.value) return
+    emit('submit', selectedMonth.value)
+}
+
+watch(
+    () => props.modelValue,
+    (isOpen) => {
+        if (!isOpen) {
+            validationTouched.value = false
+        }
+    }
+)
+</script>
--- a/frontend/components/driver-hours/DriverHoursDayView.vue
+++ b/frontend/components/driver-hours/DriverHoursDayView.vue
@@ -9,9 +9,11 @@
                <span class="pl-2">Absence</span>
                <span class="pl-4">Heure de jour</span>
                <span class="pl-2">Heure de nuit</span>
+                <span class="pl-2">Heure atelier</span>
                <span class="pl-2">Total</span>
                <span>Petit déj.</span>
                <span>Déjeuner</span>
+                <span>Dîner</span>
                <span>Nuitée</span>
                <span v-if="isAdmin" class="flex justify-between items-center">
          <span>Valider</span>
@@ -96,6 +98,12 @@
                            :disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id)"
                        />
                    </div>
+                    <div class="pl-2">
+                        <TimeSelect
+                            v-model="rows[employee.id].workshopHours"
+                            :disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id)"
+                        />
+                    </div>
                    <div class="pl-2 text-sm font-semibold">
                        {{ formatMinutes(getRowMetrics(employee.id).totalMinutes) }}
                    </div>
@@ -115,6 +123,14 @@
                            :disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id)"
                        />
                    </div>
+                    <div class="flex">
+                        <input
+                            v-model="rows[employee.id].hasDinner"
+                            type="checkbox"
+                            class="cursor-pointer h-4 w-4"
+                            :disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id)"
+                        />
+                    </div>
                    <div class="flex">
                        <input
                            v-model="rows[employee.id].hasOvernight"
--- a/frontend/components/driver-hours/DriverHoursWeekView.vue
+++ b/frontend/components/driver-hours/DriverHoursWeekView.vue
@@ -7,8 +7,9 @@
        :style="{ gridTemplateColumns: weekGridCols }"
      >
        <span>Nom</span>
-        <span v-for="day in weekDayHeaders" :key="day.date" class="text-left">{{ day.label }}</span>
+        <span v-for="day in weekDayHeaders" :key="day.date" class="text-left">{{ day.weekday }}<br>{{ day.dayDate }}</span>
        <span>Jour/Nuit <br>sem.</span>
+        <span>Atelier <br>sem.</span>
        <span>Total <br>sem.</span>
        <span>Total <br>h. supp.</span>
        <span>+25%</span>
@@ -16,7 +17,8 @@
        <span>Total <br>récup.</span>
        <span>Petit <br>déj.</span>
        <span>Déj.</span>
-        <span>Nuitée</span>
+        <span>Dîner</span>
+        <span>Nuit.</span>
      </div>

      <div class="border-x border-b border-primary-500 rounded-b-md">
@@ -44,9 +46,11 @@
        >
          <div>J {{ formatMinutes(daily.dayMinutes) }}</div>
          <div>N {{ formatMinutes(daily.nightMinutes) }}</div>
-          <div v-if="daily.hasBreakfast || daily.hasLunch || daily.hasOvernight" class="text-[10px] flex gap-1 mt-0.5">
+          <div v-if="daily.workshopMinutes">A {{ formatMinutes(daily.workshopMinutes) }}</div>
+          <div v-if="daily.hasBreakfast || daily.hasLunch || daily.hasDinner || daily.hasOvernight" class="text-[10px] flex gap-1 mt-0.5">
            <span v-if="daily.hasBreakfast" title="Petit déjeuner">PD</span>
            <span v-if="daily.hasLunch" title="Déjeuner">DJ</span>
+            <span v-if="daily.hasDinner" title="Dîner">DI</span>
            <span v-if="daily.hasOvernight" title="Nuitée">NU</span>
          </div>
        </div>
@@ -55,6 +59,9 @@
          <div>J {{ formatMinutes(row.weeklyDayMinutes) }}</div>
          <div>N {{ formatMinutes(row.weeklyNightMinutes) }}</div>
        </div>
+        <div class="font-semibold">
+          {{ formatMinutes(row.weeklyWorkshopMinutes ?? 0) }}
+        </div>
        <div class="font-semibold">
          {{ formatMinutes(row.weeklyTotalMinutes) }}
        </div>
@@ -72,6 +79,7 @@
        </div>
        <div class="font-semibold">{{ row.weeklyBreakfastCount ?? 0 }}</div>
        <div class="font-semibold">{{ row.weeklyLunchCount ?? 0 }}</div>
+        <div class="font-semibold">{{ row.weeklyDinnerCount ?? 0 }}</div>
        <div class="font-semibold">{{ row.weeklyOvernightCount ?? 0 }}</div>
      </div>
      </div>
@@ -94,7 +102,7 @@ defineProps<{
  isWeekLoading: boolean
  weekGridCols: string
  weeklySummary: WeeklyWorkHourSummary | null
-  weekDayHeaders: Array<{ date: string; label: string }>
+  weekDayHeaders: Array<{ date: string; weekday: string; dayDate: string }>
  formatMinutes: (minutes: number) => string
 }>()
 </script>
--- a/frontend/components/employees/LeaveTab.vue
+++ b/frontend/components/employees/LeaveTab.vue
@@ -1,35 +1,35 @@
 <template>
    <section class="flex h-full min-h-0 flex-col overflow-hidden pt-8">
        <div class="grid grid-cols-4 rounded-md bg-tertiary-500 text-primary-500 text-[18px] border border-primary-500">
-            <p class="col-start-1 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">Année acquis :</strong> {{
+            <p class="col-start-1 p-[10px] border-b border-r border-primary-500"><strong class="uppercase font-semibold">Année acquis :</strong> {{
                    formatCount(summary?.acquiredDays)
                }} Jours
            </p>
-            <p class="col-start-2 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">Pris :</strong>
+            <p class="col-start-2 p-[10px] border-b border-r border-primary-500"><strong class="uppercase font-semibold">Pris :</strong>
                {{ formatCount(isForfaitRule ? currentYearTakenDays : summary?.takenDays) }} Jours
            </p>
-            <p class="col-start-3 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">Reste à prendre :</strong>
+            <p class="col-start-3 p-[10px] border-b border-r border-b-white border-r-primary-500 bg-primary-500 text-white"><strong class="uppercase font-semibold">Reste à prendre :</strong>
                {{ formatCount(summary?.remainingDays) }} Jours
            </p>
-            <p class="col-start-4 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">En cours d'acquisition :</strong>
+            <p class="col-start-4 p-[10px] border-b border-primary-500"><strong class="uppercase font-semibold">En cours d'acquisition :</strong>
                {{ formatCount(summary?.accruingDays) }} Jours
            </p>
-            <p v-if="!isForfaitRule" class="col-start-1 p-[10px]"><span class="uppercase font-semibold">Samedi acquis :</span>
+            <p v-if="!isForfaitRule" class="col-start-1 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Samedi acquis :</span>
                {{ formatCount(summary?.acquiredSaturdays) }} Jours
            </p>
-            <p v-else class="col-start-1 p-[10px]"><span class="uppercase font-semibold">Année N-1 acquis :</span>
+            <p v-else class="col-start-1 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Année N-1 acquis :</span>
                {{ formatCount(summary?.previousYearAcquiredDays) }} Jours
            </p>
-            <p v-if="!isForfaitRule" class="col-start-2 p-[10px]"><span class="uppercase font-semibold">Pris :</span>
+            <p v-if="!isForfaitRule" class="col-start-2 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Pris :</span>
                {{ formatCount(summary?.takenSaturdays) }} Jours
            </p>
-            <p v-if="!isForfaitRule" class="col-start-3 p-[10px]"><span class="uppercase font-semibold">Reste à prendre :</span>
+            <p v-if="!isForfaitRule" class="col-start-3 p-[10px] border-r border-r-primary-500 bg-primary-500 text-white"><span class="uppercase font-semibold">Reste à prendre :</span>
                {{ formatCount(summary?.remainingSaturdays) }} Jours
            </p>
-            <p v-else class="col-start-2 p-[10px]"><span class="uppercase font-semibold">Pris :</span>
+            <p v-else class="col-start-2 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Pris :</span>
                {{ formatCount(summary?.previousYearTakenDays) }} Jours
            </p>
-            <p v-if="isForfaitRule" class="col-start-3 p-[10px]"><span class="uppercase font-semibold">Reste à prendre :</span>
+            <p v-if="isForfaitRule" class="col-start-3 p-[10px] border-r-primary-500 bg-primary-500 text-white"><span class="uppercase font-semibold">Reste à prendre :</span>
                {{ formatCount(summary?.previousYearRemainingDays) }} Jours
            </p>
            <div v-if="!isForfaitRule" class="col-start-4 p-[10px] flex gap-7 items-center">
--- a/frontend/components/employees/MileageTab.vue
+++ b/frontend/components/employees/MileageTab.vue
@@ -2,11 +2,13 @@
    <section class="mt-8">
        <div class="overflow-hidden bg-white">
            <div
-                class="grid grid-cols-4 border border-black bg-tertiary-500 px-6 py-3 text-[20px] font-semibold text-black rounded-t-md">
+                class="grid grid-cols-6 border border-black bg-tertiary-500 px-6 py-3 text-[20px] font-semibold text-black rounded-t-md">
                <p>Mois</p>
                <p>Nombre de Km</p>
+                <p>Montant €</p>
                <p>Commentaire</p>
-                <p>Justificatif</p>
+                <p>Justif. Km</p>
+                <p>Justif. Montant</p>
            </div>
            <div v-if="allowances.length === 0" class="px-6 py-4 text-[20px] font-bold text-primary-500 border-x border-b border-primary-500 rounded-b-md">
                Aucun frais kilométrique.
@@ -15,22 +17,36 @@
                <div
                    v-for="item in allowances"
                    :key="item.id"
-                    class="grid grid-cols-4 border-b border-primary-500 px-6 py-3 text-md font-bold text-primary-500 last:border-b-0 cursor-pointer hover:bg-tertiary-500"
+                    class="grid grid-cols-6 border-b border-primary-500 px-6 py-3 text-md font-bold text-primary-500 last:border-b-0 cursor-pointer hover:bg-tertiary-500"
                    @click="onOpenEditDrawer(item)"
                >
                    <p>{{ formatMonth(item.month) }}</p>
                    <p>{{ item.kilometers }}</p>
+                    <p>{{ item.amount ? item.amount + ' €' : '-' }}</p>
                    <p>{{ item.comment ?? '-' }}</p>
-                    <p>
+                    <p class="min-w-0">
                        <a
                            v-if="item.receiptPath"
-                            :href="getReceiptUrl(props.apiBase, item.id)"
+                            :href="getKmReceiptUrl(props.apiBase, item.id)"
                            target="_blank"
                            class="text-primary-500 hover:text-secondary-500 flex gap-2 items-center"
                            @click.stop
                        >
-                            <Icon name="mdi:file-download-outline" size="20"/>
-                            <span>{{ item.receiptName ?? 'Télécharger' }}</span>
+                            <Icon name="mdi:file-download-outline" size="20" class="shrink-0"/>
+                            <span class="truncate">{{ item.receiptName ?? 'Télécharger' }}</span>
+                        </a>
+                        <span v-else>-</span>
+                    </p>
+                    <p class="min-w-0">
+                        <a
+                            v-if="item.amountReceiptPath"
+                            :href="getAmountReceiptUrl(props.apiBase, item.id)"
+                            target="_blank"
+                            class="text-primary-500 hover:text-secondary-500 flex gap-2 items-center"
+                            @click.stop
+                        >
+                            <Icon name="mdi:file-download-outline" size="20" class="shrink-0"/>
+                            <span class="truncate">{{ item.amountReceiptName ?? 'Télécharger' }}</span>
                        </a>
                        <span v-else>-</span>
                    </p>
@@ -48,7 +64,7 @@
        </div>


-        <AppDrawer v-model="isDrawerOpen" title="Frais Kms">
+        <AppDrawer v-model="isDrawerOpen" title="Frais">
            <form class="space-y-4" @submit.prevent="onSubmit">
                <div>
                    <label class="text-md font-semibold text-neutral-700" for="mileage-month">
@@ -64,7 +80,7 @@

                <div>
                    <label class="text-md font-semibold text-neutral-700" for="mileage-kilometers">
-                        Nombre de Km <span class="text-red-600">*</span>
+                        Nombre de Km
                    </label>
                    <input
                        id="mileage-kilometers"
@@ -77,20 +93,53 @@
                </div>

                <div>
-                    <label class="text-md font-semibold text-neutral-700" for="mileage-receipt">
-                        Justificatif
+                    <label class="text-md font-semibold text-neutral-700" for="mileage-amount">
+                        Montant (€)
+                    </label>
+                    <input
+                        id="mileage-amount"
+                        v-model.number="form.amount"
+                        type="number"
+                        step="0.01"
+                        min="0"
+                        class="mt-2 w-full rounded-md border border-neutral-300 px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20"
+                    />
+                    <p class="mt-1 text-sm text-neutral-500">Au moins un des deux champs doit être rempli</p>
+                </div>
+
+                <div>
+                    <label class="text-md font-semibold text-neutral-700" for="mileage-km-receipt">
+                        Justificatif Km
                    </label>
                    <div v-if="isEditing && editingItem?.receiptName" class="mt-1 text-sm text-neutral-500">
                        Fichier actuel : {{ editingItem.receiptName }}
                    </div>
                    <input
-                        id="mileage-receipt"
-                        ref="fileInput"
+                        id="mileage-km-receipt"
+                        ref="kmFileInput"
                        type="file"
                        class="mt-2 w-full rounded-md border border-neutral-300 px-3 py-2 text-base text-neutral-900 file:mr-3 file:rounded file:border-0 file:bg-primary-500 file:px-3 file:py-1 file:text-sm file:text-white"
-                        @change="onFileChange"
+                        @change="onKmFileChange"
                    />
-                    <p v-if="fileError" class="mt-1 text-sm text-red-600">{{ fileError }}</p>
+                    <p v-if="kmFileError" class="mt-1 text-sm text-red-600">{{ kmFileError }}</p>
+                    <p v-else class="mt-1 text-sm text-neutral-500">Fichier au format pdf</p>
+                </div>
+
+                <div>
+                    <label class="text-md font-semibold text-neutral-700" for="mileage-amount-receipt">
+                        Justificatif Montant
+                    </label>
+                    <div v-if="isEditing && editingItem?.amountReceiptName" class="mt-1 text-sm text-neutral-500">
+                        Fichier actuel : {{ editingItem.amountReceiptName }}
+                    </div>
+                    <input
+                        id="mileage-amount-receipt"
+                        ref="amountFileInput"
+                        type="file"
+                        class="mt-2 w-full rounded-md border border-neutral-300 px-3 py-2 text-base text-neutral-900 file:mr-3 file:rounded file:border-0 file:bg-primary-500 file:px-3 file:py-1 file:text-sm file:text-white"
+                        @change="onAmountFileChange"
+                    />
+                    <p v-if="amountFileError" class="mt-1 text-sm text-red-600">{{ amountFileError }}</p>
                    <p v-else class="mt-1 text-sm text-neutral-500">Fichier au format pdf</p>
                </div>

@@ -139,7 +188,7 @@

 <script setup lang="ts">
 import type {MileageAllowance} from '~/services/dto/mileage-allowance'
-import {getReceiptUrl} from '~/services/mileage-allowances'
+import {getKmReceiptUrl, getAmountReceiptUrl} from '~/services/mileage-allowances'
 import AppDrawer from '~/components/AppDrawer.vue'

 const props = defineProps<{
@@ -148,17 +197,20 @@ const props = defineProps<{
 }>()

 const emit = defineEmits<{
-    (event: 'create', data: { month: string; kilometers: number; comment?: string }, file?: File): void
-    (event: 'update', id: number, data: { month: string; kilometers: number; comment?: string }, file?: File): void
+    (event: 'create', data: { month: string; kilometers: number; amount: number; comment?: string }, kmFile?: File, amountFile?: File): void
+    (event: 'update', id: number, data: { month: string; kilometers: number; amount: number; comment?: string }, kmFile?: File, amountFile?: File): void
    (event: 'delete', id: number): void
 }>()

 const isDrawerOpen = ref(false)
 const isEditing = ref(false)
 const editingItem = ref<MileageAllowance | null>(null)
-const selectedFile = ref<File | undefined>(undefined)
-const fileInput = ref<HTMLInputElement | null>(null)
-const fileError = ref('')
+const selectedKmFile = ref<File | undefined>(undefined)
+const selectedAmountFile = ref<File | undefined>(undefined)
+const kmFileInput = ref<HTMLInputElement | null>(null)
+const amountFileInput = ref<HTMLInputElement | null>(null)
+const kmFileError = ref('')
+const amountFileError = ref('')

 const currentYearMonth = () => {
    const now = new Date()
@@ -168,11 +220,12 @@ const currentYearMonth = () => {
 const form = reactive({
    month: currentYearMonth(),
    kilometers: 0,
+    amount: 0,
    comment: ''
 })

 const isFormValid = computed(() => {
-    return form.month && form.kilometers > 0 && !fileError.value
+    return form.month && (form.kilometers > 0 || form.amount > 0) && !kmFileError.value && !amountFileError.value
 })

 const monthLabels: Record<number, string> = {
@@ -201,11 +254,17 @@ const formatMonth = (dateStr: string): string => {
 const resetForm = () => {
    form.month = currentYearMonth()
    form.kilometers = 0
+    form.amount = 0
    form.comment = ''
-    selectedFile.value = undefined
-    fileError.value = ''
-    if (fileInput.value) {
-        fileInput.value.value = ''
+    selectedKmFile.value = undefined
+    selectedAmountFile.value = undefined
+    kmFileError.value = ''
+    amountFileError.value = ''
+    if (kmFileInput.value) {
+        kmFileInput.value.value = ''
+    }
+    if (amountFileInput.value) {
+        amountFileInput.value.value = ''
    }
 }

@@ -222,38 +281,57 @@ const onOpenEditDrawer = (item: MileageAllowance) => {
    // Extract YYYY-MM from YYYY-MM-DD
    form.month = item.month.substring(0, 7)
    form.kilometers = item.kilometers
+    form.amount = item.amount
    form.comment = item.comment ?? ''
-    selectedFile.value = undefined
-    if (fileInput.value) {
-        fileInput.value.value = ''
+    selectedKmFile.value = undefined
+    selectedAmountFile.value = undefined
+    if (kmFileInput.value) {
+        kmFileInput.value.value = ''
+    }
+    if (amountFileInput.value) {
+        amountFileInput.value.value = ''
    }
    isDrawerOpen.value = true
 }

-const onFileChange = (event: Event) => {
+const onKmFileChange = (event: Event) => {
    const target = event.target as HTMLInputElement
    const file = target.files?.[0]
    if (file && file.type !== 'application/pdf') {
-        fileError.value = 'Seuls les fichiers PDF sont acceptés.'
-        selectedFile.value = undefined
+        kmFileError.value = 'Seuls les fichiers PDF sont acceptés.'
+        selectedKmFile.value = undefined
        target.value = ''
        return
    }
-    fileError.value = ''
-    selectedFile.value = file ?? undefined
+    kmFileError.value = ''
+    selectedKmFile.value = file ?? undefined
+}
+
+const onAmountFileChange = (event: Event) => {
+    const target = event.target as HTMLInputElement
+    const file = target.files?.[0]
+    if (file && file.type !== 'application/pdf') {
+        amountFileError.value = 'Seuls les fichiers PDF sont acceptés.'
+        selectedAmountFile.value = undefined
+        target.value = ''
+        return
+    }
+    amountFileError.value = ''
+    selectedAmountFile.value = file ?? undefined
 }

 const onSubmit = () => {
    const data = {
        month: `${form.month}-01`,
        kilometers: form.kilometers,
+        amount: form.amount,
        comment: form.comment || undefined
    }

    if (isEditing.value && editingItem.value) {
-        emit('update', editingItem.value.id, data, selectedFile.value)
+        emit('update', editingItem.value.id, data, selectedKmFile.value, selectedAmountFile.value)
    } else {
-        emit('create', data, selectedFile.value)
+        emit('create', data, selectedKmFile.value, selectedAmountFile.value)
    }
    isDrawerOpen.value = false
 }
--- a/frontend/components/employees/RttTab.vue
+++ b/frontend/components/employees/RttTab.vue
@@ -22,8 +22,8 @@
        </button>
      </div>
      <p class="text-[16px]">
-        <span class="font-bold">RTT À LA DATE DU JOUR :</span>
-        {{ formatMinutes(summary?.availableMinutes ?? 0) }}
+        <span class="font-bold">RTT À LA SEMAINE {{ lastCompleteWeek }} : </span>
+        <span class="font-bold">{{ formatMinutes(summary?.availableMinutes ?? 0) }}</span>
      </p>
        <div class="flex justify-center">
            <button
@@ -40,34 +40,53 @@
      <table class="w-full table-fixed border-collapse text-[18px]">
        <colgroup>
          <col />
-          <col class="w-[14%]" />
-          <col class="w-[14%]" />
-          <col class="w-[14%]" />
-          <col class="w-[14%]" />
-          <col class="w-[14%]" />
-          <col class="w-[14%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
+          <col class="w-[11%]" />
        </colgroup>
        <thead>
          <tr>
            <th class="px-5 py-[10px] text-left font-bold text-primary-500 border border-primary-500">Semaine</th>
            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">Heure</th>
            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">Base</th>
-            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">25%</th>
+            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">25%</th>
+            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">Total 25%</th>
            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">Base</th>
-            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">50%</th>
+            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">50%</th>
+            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">Total 50%</th>
            <th class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">Total</th>
          </tr>
        </thead>
        <tbody>
-          <!-- Report row (only on June when carry > 0) -->
-          <tr v-if="showReportRow">
+          <!-- Report N-1 row (RTT rollover carry, June only) -->
+          <tr v-if="showCarryRow" class="bg-tertiary-500">
            <td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Report</td>
            <td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBase25Minutes) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(summary!.carryBonus25Minutes) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBase50Minutes) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(summary!.carryBonus50Minutes) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryFromPreviousYearMinutes) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBase25Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBase25Minutes) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBonus25Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBonus25Minutes) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(summary!.carryBase25Minutes + summary!.carryBonus25Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBase25Minutes + summary!.carryBonus25Minutes) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBase50Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBase50Minutes) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBonus50Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBonus50Minutes) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(summary!.carryBase50Minutes + summary!.carryBonus50Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBase50Minutes + summary!.carryBonus50Minutes) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryFromPreviousYearMinutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryFromPreviousYearMinutes) }}</span></td>
+          </tr>
+
+          <!-- Report mois précédent (cumulated balance from previous months, July+) -->
+          <tr v-if="showMonthReportRow" class="bg-tertiary-500">
+            <td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Report</td>
+            <td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.base25) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.base25) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.bonus25) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.bonus25) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(monthReport.total25) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.total25) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.base50) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.base50) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.bonus50) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.bonus50) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(monthReport.total50) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.total50) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.total) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.total) }}</span></td>
          </tr>

          <!-- Week rows (always 5) -->
@@ -84,19 +103,27 @@
              <span v-else>0 h</span>
            </td>
            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">
-              <span v-if="week">{{ formatMinutes(week.base25Minutes) }}</span>
-              <span v-else>0 h</span>
-            </td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">
-              <span v-if="week">{{ formatMinutes(week.bonus25Minutes) }}</span>
+              <span v-if="week">{{ formatMinutes(week.totalMinutes >= 0 ? week.base25Minutes : 0) }}</span>
              <span v-else>0 h</span>
            </td>
            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">
-              <span v-if="week">{{ formatMinutes(week.base50Minutes) }}</span>
+              <span v-if="week">{{ formatMinutes(week.totalMinutes >= 0 ? week.bonus25Minutes : 0) }}</span>
              <span v-else>0 h</span>
            </td>
            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">
-              <span v-if="week">{{ formatMinutes(week.bonus50Minutes) }}</span>
+              <span v-if="week">{{ formatMinutes(week.base25Minutes + week.bonus25Minutes) }}</span>
+              <span v-else>0 h</span>
+            </td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">
+              <span v-if="week">{{ formatMinutes(week.totalMinutes >= 0 ? week.base50Minutes : 0) }}</span>
+              <span v-else>0 h</span>
+            </td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">
+              <span v-if="week">{{ formatMinutes(week.totalMinutes >= 0 ? week.bonus50Minutes : 0) }}</span>
+              <span v-else>0 h</span>
+            </td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">
+              <span v-if="week">{{ formatMinutes(week.base50Minutes + week.bonus50Minutes) }}</span>
              <span v-else>0 h</span>
            </td>
            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">
@@ -110,9 +137,11 @@
            <td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500 border-t-2">Total</td>
            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2 border-t-2">{{ formatMinutes(totals.overtime) }}</td>
            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-t-2">{{ formatMinutes(totals.base25) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2 border-t-2">{{ formatMinutes(totals.bonus25) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-t-2">{{ formatMinutes(totals.bonus25) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2 border-t-2">{{ formatMinutes(totals.total25) }}</td>
            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-t-2">{{ formatMinutes(totals.base50) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2 border-t-2">{{ formatMinutes(totals.bonus50) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-t-2">{{ formatMinutes(totals.bonus50) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2 border-t-2">{{ formatMinutes(totals.total50) }}</td>
            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-t-2">{{ formatMinutes(totals.total) }}</td>
          </tr>

@@ -121,9 +150,11 @@
            <td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Payé</td>
            <td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ currentPayment ? formatMinutes(-currentPayment.paidBase25Minutes) : '0 h' }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ currentPayment ? formatMinutes(-currentPayment.paidBonus25Minutes) : '0 h' }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ currentPayment ? formatMinutes(-currentPayment.paidBonus25Minutes) : '0 h' }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ currentPayment ? formatMinutes(-(currentPayment.paidBase25Minutes + currentPayment.paidBonus25Minutes)) : '0 h' }}</td>
            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ currentPayment ? formatMinutes(-currentPayment.paidBase50Minutes) : '0 h' }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ currentPayment ? formatMinutes(-currentPayment.paidBonus50Minutes) : '0 h' }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ currentPayment ? formatMinutes(-currentPayment.paidBonus50Minutes) : '0 h' }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ currentPayment ? formatMinutes(-(currentPayment.paidBase50Minutes + currentPayment.paidBonus50Minutes)) : '0 h' }}</td>
            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(paidTotal) }}</td>
          </tr>

@@ -131,11 +162,13 @@
          <tr>
            <td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Reste</td>
            <td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(totals.base25 - (currentPayment?.paidBase25Minutes ?? 0)) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(totals.bonus25 - (currentPayment?.paidBonus25Minutes ?? 0)) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(totals.base50 - (currentPayment?.paidBase50Minutes ?? 0)) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(totals.bonus50 - (currentPayment?.paidBonus50Minutes ?? 0)) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(resteTotal) }}</td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.base25) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.base25) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.bonus25) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.bonus25) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(reste.total25) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.total25) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.base50) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.base50) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.bonus50) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.bonus50) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(reste.total50) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.total50) }}</span></td>
+            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.total) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.total) }}</span></td>
          </tr>
        </tbody>
      </table>
@@ -225,6 +258,17 @@ const emit = defineEmits<{
  (event: 'submit-rtt-payment', month: number, base25Minutes: number, bonus25Minutes: number, base50Minutes: number, bonus50Minutes: number): void
 }>()

+// --- Last complete week number ---
+
+const lastCompleteWeek = computed(() => {
+  const now = new Date()
+  const startOfYear = new Date(now.getFullYear(), 0, 1)
+  const dayOfYear = Math.floor((now.getTime() - startOfYear.getTime()) / 86400000) + 1
+  const dayOfWeek = now.getDay() || 7 // Monday = 1, Sunday = 7
+  const currentWeek = Math.ceil((dayOfYear - dayOfWeek + 10) / 7)
+  return currentWeek - 1
+})
+
 // --- Month navigation ---

 const orderedMonths = [6, 7, 8, 9, 10, 11, 12, 1, 2, 3, 4, 5] as const
@@ -290,44 +334,113 @@ const paddedWeeks = computed((): (EmployeeRttWeekSummary | null)[] => {
  return padded
 })

-// --- Report row ---
+// --- Carry row (RTT rollover from previous year, June only) ---

-const reportMonth = computed(() => {
+const carryMonth = computed(() => {
  if (!props.summary) return 6
-  const carryMonth = props.summary.carryMonth
-  // Report appears in the month AFTER carryMonth (wrapping 12 -> 1)
-  return carryMonth >= 12 ? 1 : carryMonth + 1
+  const cm = props.summary.carryMonth
+  return cm >= 12 ? 1 : cm + 1
 })

-const showReportRow = computed(() => {
-  return (
-    currentMonth.value === reportMonth.value &&
-    (props.summary?.carryFromPreviousYearMinutes ?? 0) > 0
-  )
+const showCarryRow = computed(() => {
+  if (currentMonth.value !== carryMonth.value) return false
+  if ((props.summary?.carryFromPreviousYearMinutes ?? 0) === 0) return false
+
+  // On the first exercise, hide carry if carry month is before rttStartDate
+  if (props.summary?.rttStartDate) {
+    const startDate = new Date(props.summary.rttStartDate)
+    const viewYear = currentMonth.value >= 6 ? props.summary.year - 1 : props.summary.year
+    const viewDate = new Date(viewYear, currentMonth.value - 1, 1)
+    const startMonthDate = new Date(startDate.getFullYear(), startDate.getMonth(), 1)
+    if (viewDate < startMonthDate) return false
+  }
+
+  return true
 })

-// --- Totals ---
+// --- Month report row (cumulated balance from previous months) ---
+
+// Months of the exercise in order, starting from the carry month
+const exerciseMonths = computed((): number[] => {
+  const start = carryMonth.value
+  const startIdx = orderedMonths.indexOf(start as (typeof orderedMonths)[number])
+  if (startIdx === -1) return [...orderedMonths]
+  return [...orderedMonths.slice(startIdx), ...orderedMonths.slice(0, startIdx)]
+})
+
+const monthReport = computed(() => {
+  if (!props.summary) return { base25: 0, bonus25: 0, total25: 0, base50: 0, bonus50: 0, total50: 0, total: 0 }
+
+  const cm = currentMonth.value
+  const cmIdx = exerciseMonths.value.indexOf(cm)
+  const previousMonths = exerciseMonths.value.slice(0, cmIdx)
+
+  // Start from carry (included in the cumulation)
+  let base25 = props.summary.carryBase25Minutes
+  let bonus25 = props.summary.carryBonus25Minutes
+  let base50 = props.summary.carryBase50Minutes
+  let bonus50 = props.summary.carryBonus50Minutes
+  let total = props.summary.carryFromPreviousYearMinutes
+
+  // Add weeks from previous months
+  for (const w of props.summary.weeks) {
+    if (previousMonths.includes(w.month)) {
+      base25 += w.base25Minutes
+      bonus25 += w.bonus25Minutes
+      base50 += w.base50Minutes
+      bonus50 += w.bonus50Minutes
+      total += w.totalMinutes
+    }
+  }
+
+  // Subtract payments from previous months
+  for (const p of props.summary.monthPayments) {
+    if (previousMonths.includes(p.month)) {
+      base25 -= p.paidBase25Minutes
+      bonus25 -= p.paidBonus25Minutes
+      base50 -= p.paidBase50Minutes
+      bonus50 -= p.paidBonus50Minutes
+      total -= (p.paidBase25Minutes + p.paidBonus25Minutes + p.paidBase50Minutes + p.paidBonus50Minutes)
+    }
+  }
+
+  return { base25, bonus25, total25: base25 + bonus25, base50, bonus50, total50: base50 + bonus50, total }
+})
+
+const showMonthReportRow = computed(() => {
+  // Not on the carry month — carry row handles that
+  if (currentMonth.value === carryMonth.value) return false
+
+  // On the first exercise (containing rttStartDate), hide report for months before the start date
+  if (props.summary?.rttStartDate) {
+    const startDate = new Date(props.summary.rttStartDate)
+    const startYear = startDate.getFullYear()
+    const startMonth = startDate.getMonth() + 1
+    const viewYear = currentMonth.value >= 6 ? props.summary.year - 1 : props.summary.year
+    const viewDate = new Date(viewYear, currentMonth.value - 1, 1)
+    const startMonthDate = new Date(startYear, startMonth - 1, 1)
+    if (viewDate < startMonthDate) return false
+  }
+
+  const r = monthReport.value
+  return r.total !== 0
+})
+
+// --- Totals (current month weeks only) ---

 const totals = computed(() => {
  const weeks = weeksForCurrentMonth.value
-  const base = {
+  const positive = weeks.filter((w) => w.totalMinutes >= 0)
+  return {
    overtime: weeks.reduce((s, w) => s + w.overtimeMinutes, 0),
-    base25: weeks.reduce((s, w) => s + w.base25Minutes, 0),
-    bonus25: weeks.reduce((s, w) => s + w.bonus25Minutes, 0),
-    base50: weeks.reduce((s, w) => s + w.base50Minutes, 0),
-    bonus50: weeks.reduce((s, w) => s + w.bonus50Minutes, 0),
+    base25: positive.reduce((s, w) => s + w.base25Minutes, 0),
+    bonus25: positive.reduce((s, w) => s + w.bonus25Minutes, 0),
+    total25: weeks.reduce((s, w) => s + w.base25Minutes + w.bonus25Minutes, 0),
+    base50: positive.reduce((s, w) => s + w.base50Minutes, 0),
+    bonus50: positive.reduce((s, w) => s + w.bonus50Minutes, 0),
+    total50: weeks.reduce((s, w) => s + w.base50Minutes + w.bonus50Minutes, 0),
    total: weeks.reduce((s, w) => s + w.totalMinutes, 0),
  }
-
-  if (showReportRow.value && props.summary) {
-    base.base25 += props.summary.carryBase25Minutes
-    base.bonus25 += props.summary.carryBonus25Minutes
-    base.base50 += props.summary.carryBase50Minutes
-    base.bonus50 += props.summary.carryBonus50Minutes
-    base.total += props.summary.carryFromPreviousYearMinutes
-  }
-
-  return base
 })

 const currentPayment = computed(() => {
@@ -341,8 +454,19 @@ const paidTotal = computed(() => {
  return -(p.paidBase25Minutes + p.paidBonus25Minutes + p.paidBase50Minutes + p.paidBonus50Minutes)
 })

-const resteTotal = computed(() => {
-  return totals.value.total + paidTotal.value
+const reste = computed(() => {
+  const total25 = monthReport.value.total25 + totals.value.total25
+    - (currentPayment.value?.paidBase25Minutes ?? 0) - (currentPayment.value?.paidBonus25Minutes ?? 0)
+  const total50 = monthReport.value.total50 + totals.value.total50
+    - (currentPayment.value?.paidBase50Minutes ?? 0) - (currentPayment.value?.paidBonus50Minutes ?? 0)
+
+  const base25 = Math.round(total25 / 1.25)
+  const bonus25 = total25 - base25
+  const base50 = Math.round(total50 / 1.5)
+  const bonus50 = total50 - base50
+  const total = monthReport.value.total + totals.value.total + paidTotal.value
+
+  return { base25, bonus25, total25, base50, bonus50, total50, total }
 })

 // --- Format ---
@@ -357,6 +481,11 @@ const formatMinutes = (minutes: number): string => {
  return `${sign}${hours} h ${rest} m`
 }

+const formatCentiemes = (minutes: number): string => {
+  const value = minutes / 60
+  return value.toFixed(2).replace('.', ',')
+}
+
 // --- Payment drawer ---

 const isPaymentDrawerOpen = ref(false)
--- a/frontend/components/hours/HoursWeekView.vue
+++ b/frontend/components/hours/HoursWeekView.vue
@@ -14,6 +14,7 @@
        <span>+25%</span>
        <span>+50%</span>
        <span>Total <br>récup.</span>
+        <span>Panier <br>nuit</span>
      </div>

      <div class="border-x border-b border-primary-500 rounded-b-md">
@@ -68,6 +69,9 @@
        <div class="font-semibold">
          {{ row.trackingMode === 'PRESENCE' || isInterimContract(row.contractType) ? '-' : formatMinutes(row.weeklyRecoveryMinutes ?? 0) }}
        </div>
+        <div class="font-semibold">
+          {{ (row.weeklyNightBasketCount ?? 0) > 0 ? row.weeklyNightBasketCount : '-' }}
+        </div>
      </div>
      </div>
    </div>
--- a/frontend/composables/useDriverHoursPage.ts
+++ b/frontend/composables/useDriverHoursPage.ts
@@ -22,7 +22,6 @@ import {
 } from '~/services/work-hours'
 import {
  formatDateLongFr,
-  formatWeekDayHeaderFr,
  formatWeekRangeFr,
  getIsoWeekNumber,
  getOffsetFromTodayYmd,
@@ -73,10 +72,10 @@ export const useDriverHoursPage = () => {
  const dayGridCols = computed(() => {
    const metricCol = '0.4fr'
    const validationCols = isAdmin.value ? `${metricCol}` : `${metricCol} ${metricCol}`
-    return `1.2fr 0.6fr 0.8fr 0.8fr ${metricCol} ${metricCol} ${metricCol} ${metricCol} ${validationCols}`
+    return `1.2fr 0.6fr 0.8fr 0.8fr 0.8fr ${metricCol} ${metricCol} ${metricCol} ${metricCol} ${metricCol} ${validationCols}`
  })

-  const weekGridCols = '1.6fr repeat(7, 1fr) repeat(6, 0.6fr) repeat(3, 0.4fr)'
+  const weekGridCols = '1.6fr repeat(7, 0.6fr) repeat(7, 0.6fr) repeat(4, 0.4fr)'

  const sites = computed<Site[]>(() => {
    const siteMap = new Map<number, Site>()
@@ -108,13 +107,19 @@ export const useDriverHoursPage = () => {
    })
  })

+  const displayedEmployees = computed(() => {
+    return visibleEmployees.value.filter((employee) => hasContractAtSelectedDate(employee.id))
+  })
+
  const visibleEmployeeIdSet = computed(() => new Set(visibleEmployees.value.map((employee) => employee.id)))

  const filteredWeeklySummary = computed<WeeklyWorkHourSummary | null>(() => {
    if (!weeklySummary.value) return null
    return {
      ...weeklySummary.value,
-      rows: weeklySummary.value.rows.filter((row) => visibleEmployeeIdSet.value.has(row.employeeId))
+      rows: weeklySummary.value.rows.filter((row) =>
+        visibleEmployeeIdSet.value.has(row.employeeId) && row.hasContractForWeek !== false
+      )
    }
  })

@@ -265,7 +270,13 @@ export const useDriverHoursPage = () => {

  const weekDayHeaders = computed(() => {
    const days = weeklySummary.value?.days ?? []
-    return days.map((date) => ({ date, label: formatWeekDayHeaderFr(date) }))
+    return days.map((date) => {
+      const parsed = parseYmd(date)
+      if (!parsed) return { date, weekday: '', dayDate: '' }
+      const weekday = new Intl.DateTimeFormat('fr-FR', { weekday: 'short' }).format(parsed)
+      const dayDate = new Intl.DateTimeFormat('fr-FR', { day: '2-digit', month: '2-digit' }).format(parsed)
+      return { date, weekday, dayDate }
+    })
  })

  const shiftDate = (steps: number) => {
@@ -331,8 +342,10 @@ export const useDriverHoursPage = () => {
    workHourId: null,
    dayHours: '',
    nightHours: '',
+    workshopHours: '',
    hasBreakfast: false,
    hasLunch: false,
+    hasDinner: false,
    hasOvernight: false,
    isSiteValid: false,
    isValid: false,
@@ -355,10 +368,12 @@ export const useDriverHoursPage = () => {

  const getRowMetrics = (employeeId: number) => {
    const row = rows.value[employeeId] ?? emptyRow()
-    const dayMinutes = toMinutes(row.dayHours)
+    const credited = dayContextByEmployeeId.value.get(employeeId)?.creditedMinutes ?? 0
+    const dayMinutes = toMinutes(row.dayHours) + credited
    const nightMinutes = toMinutes(row.nightHours)
-    const totalMinutes = dayMinutes + nightMinutes
-    return { dayMinutes, nightMinutes, totalMinutes }
+    const workshopMinutes = toMinutes(row.workshopHours)
+    const totalMinutes = dayMinutes + nightMinutes + workshopMinutes
+    return { dayMinutes, nightMinutes, workshopMinutes, totalMinutes }
  }

  const getRowAbsenceLabel = (employeeId: number) => {
@@ -412,8 +427,10 @@ export const useDriverHoursPage = () => {
        workHourId: workHour?.id ?? null,
        dayHours: minutesToTimeString(workHour?.dayHoursMinutes),
        nightHours: minutesToTimeString(workHour?.nightHoursMinutes),
+        workshopHours: minutesToTimeString(workHour?.workshopHoursMinutes),
        hasBreakfast: workHour?.hasBreakfast ?? false,
        hasLunch: workHour?.hasLunch ?? false,
+        hasDinner: workHour?.hasDinner ?? false,
        hasOvernight: workHour?.hasOvernight ?? false,
        isSiteValid: workHour?.isSiteValid ?? false,
        isValid: workHour?.isValid ?? false,
@@ -556,8 +573,10 @@ export const useDriverHoursPage = () => {
    isPresentAfternoon: false,
    dayHoursMinutes: null,
    nightHoursMinutes: null,
+    workshopHoursMinutes: null,
    hasBreakfast: false,
    hasLunch: false,
+    hasDinner: false,
    hasOvernight: false
  })

@@ -859,6 +878,7 @@ export const useDriverHoursPage = () => {
        const row = rows.value[employeeId] ?? emptyRow()
        const dayMin = toMinutes(row.dayHours)
        const nightMin = toMinutes(row.nightHours)
+        const workshopMin = toMinutes(row.workshopHours)

        return {
          employeeId,
@@ -872,8 +892,10 @@ export const useDriverHoursPage = () => {
          isPresentAfternoon: false,
          dayHoursMinutes: dayMin || null,
          nightHoursMinutes: nightMin || null,
+          workshopHoursMinutes: workshopMin || null,
          hasBreakfast: row.hasBreakfast,
          hasLunch: row.hasLunch,
+          hasDinner: row.hasDinner,
          hasOvernight: row.hasOvernight
        }
      })
@@ -902,6 +924,7 @@ export const useDriverHoursPage = () => {
    selectedSiteIds,
    employees,
    visibleEmployees,
+    displayedEmployees,
    rows,
    absenceTypes,
    absenceForm,
--- a/frontend/composables/useEmployeeMileage.ts
+++ b/frontend/composables/useEmployeeMileage.ts
@@ -6,7 +6,8 @@ import {
  createMileageAllowance,
  updateMileageAllowance,
  deleteMileageAllowance,
-  uploadReceipt
+  uploadKmReceipt,
+  uploadAmountReceipt
 } from '~/services/mileage-allowances'

 export const useEmployeeMileage = (employee: Ref<Employee | null>, reloadEmployee: () => Promise<void>) => {
@@ -32,24 +33,33 @@ export const useEmployeeMileage = (employee: Ref<Employee | null>, reloadEmploye
    mileageDataLoaded.value = false
  }

-  const submitCreateMileage = async (data: { month: string; kilometers: number; comment?: string }, file?: File) => {
+  const submitCreateMileage = async (data: { month: string; kilometers: number; amount: number; comment?: string }, kmFile?: File, amountFile?: File) => {
    if (!employee.value) return
    const result = await createMileageAllowance({
      employeeId: employee.value.id,
      month: data.month,
      kilometers: data.kilometers,
+      amount: data.amount,
      comment: data.comment
    })
-    if (file && result?.id) {
-      await uploadReceipt(apiBase, result.id, file)
+    if (result?.id) {
+      if (kmFile) {
+        await uploadKmReceipt(apiBase, result.id, kmFile)
+      }
+      if (amountFile) {
+        await uploadAmountReceipt(apiBase, result.id, amountFile)
+      }
    }
    await reloadEmployee()
  }

-  const submitUpdateMileage = async (id: number, data: { month: string; kilometers: number; comment?: string }, file?: File) => {
+  const submitUpdateMileage = async (id: number, data: { month: string; kilometers: number; amount: number; comment?: string }, kmFile?: File, amountFile?: File) => {
    await updateMileageAllowance(id, data)
-    if (file) {
-      await uploadReceipt(apiBase, id, file)
+    if (kmFile) {
+      await uploadKmReceipt(apiBase, id, kmFile)
+    }
+    if (amountFile) {
+      await uploadAmountReceipt(apiBase, id, amountFile)
    }
    await reloadEmployee()
  }
--- a/frontend/composables/useHoursPage.ts
+++ b/frontend/composables/useHoursPage.ts
@@ -77,7 +77,7 @@ export const useHoursPage = () => {
    return `1.2fr 0.6fr repeat(6, 0.8fr) ${metricCol} ${metricCol} ${metricCol} ${validationCols}`
  })

-  const weekGridCols = '1.6fr repeat(7, 1fr) repeat(6, 0.6fr)'
+  const weekGridCols = '1.6fr repeat(7, 1fr) repeat(6, 0.6fr) 0.3fr'

  const sites = computed<Site[]>(() => {
    const siteMap = new Map<number, Site>()
@@ -109,13 +109,19 @@ export const useHoursPage = () => {
    })
  })

+  const displayedEmployees = computed(() => {
+    return visibleEmployees.value.filter((employee) => hasContractAtSelectedDate(employee.id))
+  })
+
  const visibleEmployeeIdSet = computed(() => new Set(visibleEmployees.value.map((employee) => employee.id)))

  const filteredWeeklySummary = computed<WeeklyWorkHourSummary | null>(() => {
    if (!weeklySummary.value) return null
    return {
      ...weeklySummary.value,
-      rows: weeklySummary.value.rows.filter((row) => visibleEmployeeIdSet.value.has(row.employeeId))
+      rows: weeklySummary.value.rows.filter((row) =>
+        visibleEmployeeIdSet.value.has(row.employeeId) && row.hasContractForWeek !== false
+      )
    }
  })

@@ -1039,7 +1045,7 @@ export const useHoursPage = () => {
    isSubmitting.value = true
    try {
      const entries = employees.value
-        .filter((employee) => hasContractAtSelectedDate(employee.id))
+        .filter((employee) => hasContractAtSelectedDate(employee.id) && !isRowLocked(employee.id))
        .map((employee) => {
        const employeeId = employee.id
        const row = rows.value[employeeId] ?? emptyRow()
@@ -1096,6 +1102,7 @@ export const useHoursPage = () => {
    selectedSiteIds,
    employees,
    visibleEmployees,
+    displayedEmployees,
    rows,
    absenceTypes,
    absenceForm,
--- a/frontend/layouts/default.vue
+++ b/frontend/layouts/default.vue
@@ -21,14 +21,16 @@
                    <NuxtLink
                        to="/hours"
                        class="flex items-center gap-2 py-2 text-md text-black hover:bg-tertiary-500 hover:text-primary-500"
-                        :class="route.path.startsWith('/hours')
-                            ? 'bg-tertiary-500 text-primary-500 font-bold'
-                            : ''"
+                        :class="[
+                            route.path.startsWith('/hours') ? 'bg-tertiary-500 text-primary-500 font-bold' : '',
+                            !isAdmin ? 'border-t border-secondary-500 pt-3' : ''
+                        ]"
                    >
                        <Icon name="mdi:clock-time-four-outline" size="24"/>
                        <p>Heures</p>
                    </NuxtLink>
                    <NuxtLink
+                        v-if="isAdmin"
                        to="/driver-hours"
                        class="flex items-center gap-2 py-2 text-md text-black hover:bg-tertiary-500 hover:text-primary-500"
                        :class="route.path.startsWith('/driver-hours')
--- a/frontend/pages/driver-hours.vue
+++ b/frontend/pages/driver-hours.vue
@@ -38,7 +38,7 @@
                <DriverHoursDayView
                    v-if="viewMode === 'day'"
                    v-model:rows="rows"
-                    :employees="visibleEmployees"
+                    :employees="displayedEmployees"
                    :is-admin="isAdmin"
                    :is-site-manager="isSiteManager"
                    :day-grid-cols="dayGridCols"
@@ -121,6 +121,7 @@ const {
  selectedSiteIds,
  employees,
  visibleEmployees,
+  displayedEmployees,
  rows,
  absenceTypes,
  absenceForm,
--- a/frontend/pages/employees/[id].vue
+++ b/frontend/pages/employees/[id].vue
@@ -62,8 +62,8 @@
                            : 'border-transparent text-primary-500/50 hover:text-primary-500'"
                        @click="activeTab = 'mileage'"
                    >
-                        <Icon name="mdi:car-outline" size="24" class="align-self"/>
-                        Frais Kms
+                        <Icon name="mdi:account-cash-outline" size="24" class="align-self"/>
+                        Frais
                    </button>
                    <button
                        class="pb-2 border-b-2 flex items-center gap-3"
--- a/frontend/pages/employees/index.vue
+++ b/frontend/pages/employees/index.vue
@@ -3,19 +3,43 @@
        <div class="shrink-0">
            <div class="flex items-center justify-between">
                <h1 class="text-4xl font-bold text-primary-500">Employés</h1>
-                <button
-                    type="button"
-                    class="flex items-center gap-2 rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
-                    @click="openCreate"
-                >
-                    + Ajouter un employé
-                </button>
+                <div class="flex items-center gap-3">
+                    <button
+                        type="button"
+                        class="flex items-center gap-2 rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+                        @click="handleLeaveRecapPrint"
+                    >
+                        Export récap. congés
+                    </button>
+                    <button
+                        type="button"
+                        class="flex items-center gap-2 rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+                        @click="isSalaryRecapOpen = true"
+                    >
+                        Export récap. salaire
+                    </button>
+                    <button
+                        type="button"
+                        class="flex items-center gap-2 rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+                        @click="openCreate"
+                    >
+                        + Ajouter un employé
+                    </button>
+                </div>
            </div>
-            <div class="flex gap-10 py-7">
+            <div class="flex gap-3 py-7">
                <div class="w-80">
                    <EmployeeNameFilterInput v-model="employeeFilter"/>
                </div>
                <SiteFilterSelector v-if="sites.length > 0" v-model="selectedSiteIds" :sites="sites"/>
+                <select
+                    v-model="contractStatusFilter"
+                    class="rounded-md border border-primary-500 bg-white px-3 py-2 text-md font-semibold text-primary-500 cursor-pointer"
+                >
+                    <option value="active">Avec contrat</option>
+                    <option value="inactive">Sans contrat</option>
+                    <option value="all">Tous</option>
+                </select>
            </div>
        </div>

@@ -40,7 +64,7 @@
                    <div class="text-center text-[20px]">
                        <p class="text-primary-500 font-bold">{{ employee.firstName }} {{ employee.lastName }}</p>
                        <p>Nom du poste occupé</p>
-                        <p>Site ({{ employee.site?.name ?? '-' }})</p>
+                        <p>{{ employee.site?.name ?? '-' }}</p>
                    </div>
                </div>

@@ -200,6 +224,11 @@
                </div>
            </form>
        </AppDrawer>
+
+        <SalaryRecapDrawer
+            v-model="isSalaryRecapOpen"
+            @submit="handleSalaryRecapPrint"
+        />
    </div>
 </template>

@@ -211,7 +240,9 @@ import {listContracts} from '~/services/contracts'
 import {createEmployee, deleteEmployee, listEmployees, updateEmployee} from '~/services/employees'
 import {listSites} from '~/services/sites'
 import SiteFilterSelector from '~/components/SiteFilterSelector.vue'
+import SalaryRecapDrawer from '~/components/SalaryRecapDrawer.vue'
 import {contractNatureLabel, isContractNature, requiresContractEndDate, showsContractEndDate} from '~/utils/contract'
+import {usePdfPrinter} from '~/composables/usePdfPrinter'

 useHead({
    title: 'Employés'
@@ -220,6 +251,8 @@ useHead({
 const isDrawerOpen = ref(false)
 const isSubmitting = ref(false)
 const isLoading = ref(false)
+const isSalaryRecapOpen = ref(false)
+const { printPdf } = usePdfPrinter()
 const sitesInitialized = ref(false)
 const editingEmployee = ref<Employee | null>(null)
 const drawerTitle = computed(() =>
@@ -230,20 +263,21 @@ const employees = ref<Employee[]>([])
 const sites = ref<Site[]>([])
 const contracts = ref<Contract[]>([])
 const employeeFilter = ref('')
+const contractStatusFilter = ref<'active' | 'inactive' | 'all'>('active')
 const selectedSiteIds = ref<number[]>([])

 const filteredEmployees = computed<Employee[]>(() => {
    if (selectedSiteIds.value.length === 0) return []

    const filter = employeeFilter.value.trim().toLowerCase()
-    const bySite = employees.value.filter((employee) => {
+    return employees.value.filter((employee) => {
        const siteId = employee.site?.id
-        return !!siteId && selectedSiteIds.value.includes(siteId)
-    })
+        if (!siteId || !selectedSiteIds.value.includes(siteId)) return false

-    if (!filter) return bySite
+        if (contractStatusFilter.value === 'active' && !employee.hasActiveContract) return false
+        if (contractStatusFilter.value === 'inactive' && employee.hasActiveContract) return false

-    return bySite.filter((employee) => {
+        if (!filter) return true
        const firstName = employee.firstName?.toLowerCase() ?? ''
        const lastName = employee.lastName?.toLowerCase() ?? ''
        return firstName.includes(filter) || lastName.includes(filter)
@@ -503,6 +537,15 @@ const openCreate = () => {
    isDrawerOpen.value = true
 }

+const handleLeaveRecapPrint = async () => {
+    await printPdf('/leave-recap/print')
+}
+
+const handleSalaryRecapPrint = async (month: string) => {
+    await printPdf(`/salary-recap/print?month=${month}`)
+    isSalaryRecapOpen.value = false
+}
+
 const confirmDelete = async (employee: Employee) => {
    const ok = window.confirm(`Supprimer ${employee.firstName} ${employee.lastName} ?`)
    if (!ok) return
--- a/frontend/pages/hours.vue
+++ b/frontend/pages/hours.vue
@@ -38,7 +38,7 @@
                <HoursDayView
                    v-if="viewMode === 'day'"
                    v-model:rows="rows"
-                    :employees="visibleEmployees"
+                    :employees="displayedEmployees"
                    :is-admin="isAdmin"
                    :is-site-manager="isSiteManager"
                    :day-grid-cols="dayGridCols"
@@ -126,6 +126,7 @@ const {
  selectedSiteIds,
  employees,
  visibleEmployees,
+  displayedEmployees,
  rows,
  absenceTypes,
  absenceForm,
--- a/frontend/pages/login.vue
+++ b/frontend/pages/login.vue
@@ -68,7 +68,8 @@ const handleSubmit = async () => {
    try {
        await auth.login(username.value, password.value)

-        await router.push('/calendar')
+        const isAdmin = auth.user?.roles?.includes('ROLE_ADMIN')
+        await router.push(isAdmin ? '/calendar' : '/hours')
    } finally {
        isSubmitting.value = false
    }
--- a/frontend/services/dto/employee-rtt-summary.ts
+++ b/frontend/services/dto/employee-rtt-summary.ts
@@ -32,4 +32,5 @@ export type EmployeeRttSummary = {
  availableMinutes: number
  weeks: EmployeeRttWeekSummary[]
  monthPayments: RttMonthPayment[]
+  rttStartDate: string | null
 }
--- a/frontend/services/dto/employee.ts
+++ b/frontend/services/dto/employee.ts
@@ -27,6 +27,7 @@ export type Employee = {
  lastName: string
  site: Site
  contract?: Contract | null
+  hasActiveContract?: boolean
  isDriver?: boolean
  currentContractNature?: 'CDI' | 'CDD' | 'INTERIM'
  currentContractStartDate?: string | null
--- a/frontend/services/dto/mileage-allowance.ts
+++ b/frontend/services/dto/mileage-allowance.ts
@@ -2,8 +2,11 @@ export type MileageAllowance = {
  id: number
  month: string
  kilometers: number
+  amount: number
  comment: string | null
  receiptPath: string | null
  receiptName: string | null
+  amountReceiptPath: string | null
+  amountReceiptName: string | null
  createdAt: string
 }
--- a/frontend/services/dto/work-hour.ts
+++ b/frontend/services/dto/work-hour.ts
@@ -15,8 +15,10 @@ export type WorkHour = {
  isPresentAfternoon?: boolean
  dayHoursMinutes?: number | null
  nightHoursMinutes?: number | null
+  workshopHoursMinutes?: number | null
  hasBreakfast?: boolean
  hasLunch?: boolean
+  hasDinner?: boolean
  hasOvernight?: boolean
  isSiteValid?: boolean
  isValid?: boolean
@@ -35,8 +37,10 @@ export type WorkHourEntryPayload = {
  isPresentAfternoon?: boolean
  dayHoursMinutes?: number | null
  nightHoursMinutes?: number | null
+  workshopHoursMinutes?: number | null
  hasBreakfast?: boolean
  hasLunch?: boolean
+  hasDinner?: boolean
  hasOvernight?: boolean
 }

@@ -44,13 +48,16 @@ export type WeeklyWorkHourDailySummary = {
  date: string
  dayMinutes: number
  nightMinutes: number
+  workshopMinutes?: number
  totalMinutes: number
  present?: number | null
  hasAbsence?: boolean
  absenceLabel?: string | null
  absenceColor?: string | null
+  hasNightBasket?: boolean
  hasBreakfast?: boolean
  hasLunch?: boolean
+  hasDinner?: boolean
  hasOvernight?: boolean
 }

@@ -65,16 +72,20 @@ export type WeeklyWorkHourRowSummary = {
  daily: WeeklyWorkHourDailySummary[]
  weeklyDayMinutes: number
  weeklyNightMinutes: number
+  weeklyWorkshopMinutes?: number
  weeklyTotalMinutes: number
  weeklyPresenceCount?: number
  weeklyOvertimeTotalMinutes?: number
  weeklyOvertime25Minutes?: number
  weeklyOvertime50Minutes?: number
  weeklyRecoveryMinutes?: number
+  weeklyNightBasketCount?: number
  isDriver?: boolean
  weeklyBreakfastCount?: number
  weeklyLunchCount?: number
+  weeklyDinnerCount?: number
  weeklyOvernightCount?: number
+  hasContractForWeek?: boolean
 }

 export type WeeklyWorkHourSummary = {
@@ -106,8 +117,10 @@ export type DriverHourRow = {
  workHourId: number | null
  dayHours: string
  nightHours: string
+  workshopHours: string
  hasBreakfast: boolean
  hasLunch: boolean
+  hasDinner: boolean
  hasOvernight: boolean
  isSiteValid: boolean
  isValid: boolean
--- a/frontend/services/mileage-allowances.ts
+++ b/frontend/services/mileage-allowances.ts
@@ -16,6 +16,7 @@ export const createMileageAllowance = async (data: {
  employeeId: number
  month: string
  kilometers: number
+  amount: number
  comment?: string
 }) => {
  const api = useApi()
@@ -23,6 +24,7 @@ export const createMileageAllowance = async (data: {
    employee: `/api/employees/${data.employeeId}`,
    month: data.month,
    kilometers: data.kilometers,
+    amount: data.amount,
    comment: data.comment
  }, {
    toastSuccessKey: 'success.mileage.create',
@@ -33,12 +35,14 @@ export const createMileageAllowance = async (data: {
 export const updateMileageAllowance = async (id: number, data: {
  month: string
  kilometers: number
+  amount: number
  comment?: string
 }) => {
  const api = useApi()
  return api.patch<MileageAllowance>(`/mileage_allowances/${id}`, {
    month: data.month,
    kilometers: data.kilometers,
+    amount: data.amount,
    comment: data.comment
  }, {
    toastSuccessKey: 'success.mileage.update',
@@ -54,7 +58,7 @@ export const deleteMileageAllowance = async (id: number) => {
  })
 }

-export const uploadReceipt = async (baseURL: string, id: number, file: File) => {
+export const uploadKmReceipt = async (baseURL: string, id: number, file: File) => {
  const formData = new FormData()
  formData.append('file', file)
  return $fetch(`${baseURL}/mileage_allowances/${id}/receipt`, {
@@ -64,6 +68,20 @@ export const uploadReceipt = async (baseURL: string, id: number, file: File) =>
  })
 }

-export const getReceiptUrl = (baseURL: string, id: number): string => {
+export const uploadAmountReceipt = async (baseURL: string, id: number, file: File) => {
+  const formData = new FormData()
+  formData.append('file', file)
+  return $fetch(`${baseURL}/mileage_allowances/${id}/amount-receipt`, {
+    method: 'POST',
+    body: formData,
+    credentials: 'include'
+  })
+}
+
+export const getKmReceiptUrl = (baseURL: string, id: number): string => {
  return `${baseURL}/mileage_allowances/${id}/receipt`
 }
+
+export const getAmountReceiptUrl = (baseURL: string, id: number): string => {
+  return `${baseURL}/mileage_allowances/${id}/amount-receipt`
+}
--- a/migrations/Version20260316100000.php
+++ b/migrations/Version20260316100000.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260316100000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add has_dinner column to work_hours';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE work_hours ADD has_dinner BOOLEAN DEFAULT FALSE NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE work_hours DROP COLUMN has_dinner');
+    }
+}
--- a/migrations/Version20260316100100.php
+++ b/migrations/Version20260316100100.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260316100100 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add workshop_hours_minutes column to work_hours';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE work_hours ADD workshop_hours_minutes INTEGER DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE work_hours DROP COLUMN workshop_hours_minutes');
+    }
+}
--- a/migrations/Version20260318143503.php
+++ b/migrations/Version20260318143503.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260318143503 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add amount column to mileage_allowances';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE mileage_allowances ADD COLUMN amount DOUBLE PRECISION DEFAULT 0 NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE mileage_allowances DROP COLUMN amount');
+    }
+}
--- a/migrations/Version20260319100000.php
+++ b/migrations/Version20260319100000.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260319100000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add amount receipt fields to mileage_allowances';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE mileage_allowances ADD amount_receipt_path VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE mileage_allowances ADD amount_receipt_name VARCHAR(255) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE mileage_allowances DROP COLUMN amount_receipt_path');
+        $this->addSql('ALTER TABLE mileage_allowances DROP COLUMN amount_receipt_name');
+    }
+}
--- a/src/ApiResource/EmployeeLeaveSummary.php
+++ b/src/ApiResource/EmployeeLeaveSummary.php
@@ -12,7 +12,7 @@ use App\State\EmployeeLeaveSummaryProvider;
    operations: [
        new Get(
            uriTemplate: '/employees/{id}/leave-summary',
-            security: "is_granted('ROLE_USER')",
+            security: "is_granted('ROLE_ADMIN')",
            provider: EmployeeLeaveSummaryProvider::class
        ),
    ],
--- a/src/ApiResource/EmployeeRttSummary.php
+++ b/src/ApiResource/EmployeeRttSummary.php
@@ -14,7 +14,7 @@ use App\State\EmployeeRttSummaryProvider;
    operations: [
        new Get(
            uriTemplate: '/employees/{id}/rtt-summary',
-            security: "is_granted('ROLE_USER')",
+            security: "is_granted('ROLE_ADMIN')",
            provider: EmployeeRttSummaryProvider::class
        ),
    ],
@@ -32,6 +32,7 @@ final class EmployeeRttSummary
    public int $currentYearRecoveryMinutes   = 0;
    public int $availableMinutes             = 0;
    public int $totalPaidMinutes             = 0;
+    public ?string $rttStartDate             = null;

    /** @var list<RttMonthPayment> */
    public array $monthPayments = [];
--- a/src/ApiResource/LeaveRecapPrint.php
+++ b/src/ApiResource/LeaveRecapPrint.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\ApiResource;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use App\State\LeaveRecapPrintProvider;
+
+#[ApiResource(
+    operations: [
+        new Get(
+            uriTemplate: '/leave-recap/print',
+            provider: LeaveRecapPrintProvider::class,
+            security: "is_granted('ROLE_ADMIN')"
+        ),
+    ]
+)]
+final class LeaveRecapPrint {}
--- a/src/ApiResource/SalaryRecapPrint.php
+++ b/src/ApiResource/SalaryRecapPrint.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\ApiResource;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\QueryParameter;
+use App\State\SalaryRecapPrintProvider;
+
+#[ApiResource(
+    operations: [
+        new Get(
+            uriTemplate: '/salary-recap/print',
+            provider: SalaryRecapPrintProvider::class,
+            parameters: [
+                new QueryParameter(key: 'month', required: true),
+            ],
+            security: "is_granted('ROLE_ADMIN')"
+        ),
+    ]
+)]
+final class SalaryRecapPrint {}
--- a/src/Dto/WorkHours/WeeklyDaySummary.php
+++ b/src/Dto/WorkHours/WeeklyDaySummary.php
@@ -10,13 +10,16 @@ final class WeeklyDaySummary
        public string $date,
        public int $dayMinutes,
        public int $nightMinutes,
+        public int $workshopMinutes,
        public int $totalMinutes,
        public ?float $present = null,
        public bool $hasAbsence = false,
        public ?string $absenceLabel = null,
        public ?string $absenceColor = null,
+        public bool $hasNightBasket = false,
        public bool $hasBreakfast = false,
        public bool $hasLunch = false,
+        public bool $hasDinner = false,
        public bool $hasOvernight = false,
    ) {}
 }
--- a/src/Dto/WorkHours/WeeklySummaryRow.php
+++ b/src/Dto/WorkHours/WeeklySummaryRow.php
@@ -20,15 +20,19 @@ final class WeeklySummaryRow
        public array $daily,
        public int $weeklyDayMinutes,
        public int $weeklyNightMinutes,
+        public int $weeklyWorkshopMinutes,
        public int $weeklyTotalMinutes,
        public float $weeklyPresenceCount,
        public int $weeklyOvertimeTotalMinutes,
        public int $weeklyOvertime25Minutes,
        public int $weeklyOvertime50Minutes,
        public int $weeklyRecoveryMinutes,
+        public int $weeklyNightBasketCount = 0,
        public bool $isDriver = false,
        public int $weeklyBreakfastCount = 0,
        public int $weeklyLunchCount = 0,
+        public int $weeklyDinnerCount = 0,
        public int $weeklyOvernightCount = 0,
+        public bool $hasContractForWeek = true,
    ) {}
 }
--- a/src/Entity/Bonus.php
+++ b/src/Entity/Bonus.php
@@ -21,10 +21,10 @@ use Symfony\Component\Serializer\Attribute\Groups;
 #[ApiResource(
    operations: [
        new Get(
-            security: "is_granted('ROLE_USER')"
+            security: "is_granted('ROLE_ADMIN')"
        ),
        new GetCollection(
-            security: "is_granted('ROLE_USER')"
+            security: "is_granted('ROLE_ADMIN')"
        ),
        new Post(
            security: "is_granted('ROLE_ADMIN')"
--- a/src/Entity/Employee.php
+++ b/src/Entity/Employee.php
@@ -24,6 +24,7 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
    paginationEnabled: false,
    security: "is_granted('ROLE_ADMIN')",
    processor: EmployeeWriteProcessor::class,
+    order: ['site.name' => 'ASC', 'displayOrder' => 'ASC', 'lastName' => 'ASC', 'firstName' => 'ASC'],
 )]
 #[ORM\Entity(repositoryClass: EmployeeRepository::class)]
 #[ORM\Table(name: 'employees')]
@@ -260,6 +261,12 @@ class Employee
        return $this;
    }

+    #[Groups(['employee:read'])]
+    public function getHasActiveContract(): bool
+    {
+        return null !== $this->resolveCurrentContractPeriod();
+    }
+
    #[Groups(['employee:read'])]
    public function getIsDriver(): bool
    {
--- a/src/Entity/MileageAllowance.php
+++ b/src/Entity/MileageAllowance.php
@@ -14,6 +14,8 @@ use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\Patch;
 use ApiPlatform\Metadata\Post;
 use App\Repository\MileageAllowanceRepository;
+use App\State\MileageAllowanceAmountReceiptDownloadProvider;
+use App\State\MileageAllowanceAmountReceiptUploadProcessor;
 use App\State\MileageAllowanceDeleteProcessor;
 use App\State\MileageAllowanceReceiptDownloadProvider;
 use App\State\MileageAllowanceReceiptUploadProcessor;
@@ -24,10 +26,10 @@ use Symfony\Component\Serializer\Attribute\Groups;
 #[ApiResource(
    operations: [
        new Get(
-            security: "is_granted('ROLE_USER')"
+            security: "is_granted('ROLE_ADMIN')"
        ),
        new GetCollection(
-            security: "is_granted('ROLE_USER')"
+            security: "is_granted('ROLE_ADMIN')"
        ),
        new Post(
            security: "is_granted('ROLE_ADMIN')"
@@ -47,9 +49,20 @@ use Symfony\Component\Serializer\Attribute\Groups;
        ),
        new Get(
            uriTemplate: '/mileage_allowances/{id}/receipt',
-            security: "is_granted('ROLE_USER')",
+            security: "is_granted('ROLE_ADMIN')",
            provider: MileageAllowanceReceiptDownloadProvider::class,
        ),
+        new Post(
+            uriTemplate: '/mileage_allowances/{id}/amount-receipt',
+            security: "is_granted('ROLE_ADMIN')",
+            deserialize: false,
+            processor: MileageAllowanceAmountReceiptUploadProcessor::class,
+        ),
+        new Get(
+            uriTemplate: '/mileage_allowances/{id}/amount-receipt',
+            security: "is_granted('ROLE_ADMIN')",
+            provider: MileageAllowanceAmountReceiptDownloadProvider::class,
+        ),
    ],
    normalizationContext: [
        'groups'          => ['mileage_allowance:read', 'employee:read'],
@@ -87,6 +100,10 @@ class MileageAllowance
    #[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
    private float $kilometers = 0;

+    #[ORM\Column(type: 'float', options: ['default' => 0])]
+    #[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
+    private float $amount = 0;
+
    #[ORM\Column(type: 'text', nullable: true)]
    #[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
    private ?string $comment = null;
@@ -99,6 +116,14 @@ class MileageAllowance
    #[Groups(['mileage_allowance:read'])]
    private ?string $receiptName = null;

+    #[ORM\Column(type: 'string', length: 255, nullable: true)]
+    #[Groups(['mileage_allowance:read'])]
+    private ?string $amountReceiptPath = null;
+
+    #[ORM\Column(type: 'string', length: 255, nullable: true)]
+    #[Groups(['mileage_allowance:read'])]
+    private ?string $amountReceiptName = null;
+
    #[ORM\Column(type: 'datetime_immutable')]
    #[Groups(['mileage_allowance:read'])]
    private DateTimeImmutable $createdAt;
@@ -149,6 +174,18 @@ class MileageAllowance
        return $this;
    }

+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
+
+    public function setAmount(float $amount): self
+    {
+        $this->amount = $amount;
+
+        return $this;
+    }
+
    public function getComment(): ?string
    {
        return $this->comment;
@@ -185,6 +222,30 @@ class MileageAllowance
        return $this;
    }

+    public function getAmountReceiptPath(): ?string
+    {
+        return $this->amountReceiptPath;
+    }
+
+    public function setAmountReceiptPath(?string $amountReceiptPath): self
+    {
+        $this->amountReceiptPath = $amountReceiptPath;
+
+        return $this;
+    }
+
+    public function getAmountReceiptName(): ?string
+    {
+        return $this->amountReceiptName;
+    }
+
+    public function setAmountReceiptName(?string $amountReceiptName): self
+    {
+        $this->amountReceiptName = $amountReceiptName;
+
+        return $this;
+    }
+
    public function getCreatedAt(): DateTimeImmutable
    {
        return $this->createdAt;
--- a/src/Entity/WorkHour.php
+++ b/src/Entity/WorkHour.php
@@ -107,6 +107,10 @@ class WorkHour
    #[Groups(['work_hour:read'])]
    private ?int $nightHoursMinutes = null;

+    #[ORM\Column(type: 'integer', nullable: true)]
+    #[Groups(['work_hour:read'])]
+    private ?int $workshopHoursMinutes = null;
+
    #[ORM\Column(type: 'boolean', options: ['default' => false])]
    #[Groups(['work_hour:read'])]
    private bool $hasBreakfast = false;
@@ -115,6 +119,10 @@ class WorkHour
    #[Groups(['work_hour:read'])]
    private bool $hasLunch = false;

+    #[ORM\Column(type: 'boolean', options: ['default' => false])]
+    #[Groups(['work_hour:read'])]
+    private bool $hasDinner = false;
+
    #[ORM\Column(type: 'boolean', options: ['default' => false])]
    #[Groups(['work_hour:read'])]
    private bool $hasOvernight = false;
@@ -256,6 +264,18 @@ class WorkHour
        return $this;
    }

+    public function getWorkshopHoursMinutes(): ?int
+    {
+        return $this->workshopHoursMinutes;
+    }
+
+    public function setWorkshopHoursMinutes(?int $workshopHoursMinutes): self
+    {
+        $this->workshopHoursMinutes = $workshopHoursMinutes;
+
+        return $this;
+    }
+
    public function getHasBreakfast(): bool
    {
        return $this->hasBreakfast;
@@ -280,6 +300,18 @@ class WorkHour
        return $this;
    }

+    public function getHasDinner(): bool
+    {
+        return $this->hasDinner;
+    }
+
+    public function setHasDinner(bool $hasDinner): self
+    {
+        $this->hasDinner = $hasDinner;
+
+        return $this;
+    }
+
    public function getHasOvernight(): bool
    {
        return $this->hasOvernight;
--- a/src/Repository/AbsenceRepository.php
+++ b/src/Repository/AbsenceRepository.php
@@ -100,6 +100,38 @@ final class AbsenceRepository extends ServiceEntityRepository implements Absence
        return $qb->getQuery()->getResult();
    }

+    /**
+     * @return list<DateTimeImmutable> sorted maladie dates
+     */
+    public function findMaladieDatesByEmployee(
+        Employee $employee,
+        DateTimeImmutable $from,
+        DateTimeImmutable $to
+    ): array {
+        $results = $this->createQueryBuilder('a')
+            ->select('a.startDate')
+            ->join('a.type', 't')
+            ->andWhere('a.employee = :employee')
+            ->andWhere('t.code = :code')
+            ->andWhere('a.startDate >= :from')
+            ->andWhere('a.startDate <= :to')
+            ->setParameter('employee', $employee)
+            ->setParameter('code', 'M')
+            ->setParameter('from', $from)
+            ->setParameter('to', $to)
+            ->orderBy('a.startDate', 'ASC')
+            ->getQuery()
+            ->getArrayResult()
+        ;
+
+        return array_map(
+            static fn (array $row): DateTimeImmutable => $row['startDate'] instanceof DateTimeImmutable
+                ? $row['startDate']
+                : DateTimeImmutable::createFromInterface($row['startDate']),
+            $results
+        );
+    }
+
    /**
     * @return list<Absence>
     */
--- a/src/Repository/BonusRepository.php
+++ b/src/Repository/BonusRepository.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Repository;

 use App\Entity\Bonus;
+use DateTimeImmutable;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;

@@ -17,4 +18,21 @@ final class BonusRepository extends ServiceEntityRepository
    {
        parent::__construct($registry, Bonus::class);
    }
+
+    /**
+     * @return Bonus[]
+     */
+    public function findByMonth(DateTimeImmutable $from, DateTimeImmutable $to): array
+    {
+        return $this->createQueryBuilder('b')
+            ->andWhere('b.month >= :from')
+            ->andWhere('b.month <= :to')
+            ->setParameter('from', $from)
+            ->setParameter('to', $to)
+            ->innerJoin('b.employee', 'e')
+            ->addSelect('e')
+            ->getQuery()
+            ->getResult()
+        ;
+    }
 }
--- a/src/Repository/EmployeeRepository.php
+++ b/src/Repository/EmployeeRepository.php
@@ -87,8 +87,7 @@ final class EmployeeRepository extends ServiceEntityRepository implements Employ
            ->addSelect('s')
            ->leftJoin('e.contract', 'c')
            ->addSelect('c')
-            ->orderBy('s.displayOrder', 'ASC')
-            ->addOrderBy('s.name', 'ASC')
+            ->orderBy('s.name', 'ASC')
            ->addOrderBy('e.displayOrder', 'ASC')
            ->addOrderBy('e.lastName', 'ASC')
            ->addOrderBy('e.firstName', 'ASC')
--- a/src/Repository/EmployeeRttPaymentRepository.php
+++ b/src/Repository/EmployeeRttPaymentRepository.php
@@ -43,4 +43,21 @@ final class EmployeeRttPaymentRepository extends ServiceEntityRepository
            ->getResult()
        ;
    }
+
+    /**
+     * @return EmployeeRttPayment[]
+     */
+    public function findByYearAndMonth(int $year, int $month): array
+    {
+        return $this->createQueryBuilder('p')
+            ->andWhere('p.year = :year')
+            ->andWhere('p.month = :month')
+            ->setParameter('year', $year)
+            ->setParameter('month', $month)
+            ->innerJoin('p.employee', 'e')
+            ->addSelect('e')
+            ->getQuery()
+            ->getResult()
+        ;
+    }
 }
--- a/src/Repository/MileageAllowanceRepository.php
+++ b/src/Repository/MileageAllowanceRepository.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Repository;

 use App\Entity\MileageAllowance;
+use DateTimeImmutable;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;

@@ -17,4 +18,21 @@ final class MileageAllowanceRepository extends ServiceEntityRepository
    {
        parent::__construct($registry, MileageAllowance::class);
    }
+
+    /**
+     * @return MileageAllowance[]
+     */
+    public function findByMonth(DateTimeImmutable $from, DateTimeImmutable $to): array
+    {
+        return $this->createQueryBuilder('m')
+            ->andWhere('m.month >= :from')
+            ->andWhere('m.month <= :to')
+            ->setParameter('from', $from)
+            ->setParameter('to', $to)
+            ->innerJoin('m.employee', 'e')
+            ->addSelect('e')
+            ->getQuery()
+            ->getResult()
+        ;
+    }
 }
--- a/src/Repository/WorkHourRepository.php
+++ b/src/Repository/WorkHourRepository.php
@@ -228,6 +228,45 @@ final class WorkHourRepository extends ServiceEntityRepository implements WorkHo
        return $result;
    }

+    public function isWeekFullyValidated(Employee $employee, DateTimeImmutable $from, DateTimeImmutable $to): bool
+    {
+        // At least one validated day must exist
+        $validatedCount = (int) $this->createQueryBuilder('w')
+            ->select('COUNT(w.id)')
+            ->andWhere('w.employee = :employee')
+            ->andWhere('w.workDate >= :from')
+            ->andWhere('w.workDate <= :to')
+            ->andWhere('w.isValid = :isValid')
+            ->setParameter('employee', $employee)
+            ->setParameter('from', $from)
+            ->setParameter('to', $to)
+            ->setParameter('isValid', true)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        if (0 === $validatedCount) {
+            return false;
+        }
+
+        // No non-validated day must exist in the range
+        $nonValidatedCount = (int) $this->createQueryBuilder('w')
+            ->select('COUNT(w.id)')
+            ->andWhere('w.employee = :employee')
+            ->andWhere('w.workDate >= :from')
+            ->andWhere('w.workDate <= :to')
+            ->andWhere('w.isValid = :isValid')
+            ->setParameter('employee', $employee)
+            ->setParameter('from', $from)
+            ->setParameter('to', $to)
+            ->setParameter('isValid', false)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        return 0 === $nonValidatedCount;
+    }
+
    public function hasPendingSiteValidationForSiteAndDate(int $siteId, DateTimeInterface $date): bool
    {
        $workDate = DateTimeImmutable::createFromInterface($date);
--- a/src/Service/Leave/LeaveBalanceComputationService.php
+++ b/src/Service/Leave/LeaveBalanceComputationService.php
@@ -24,6 +24,7 @@ final readonly class LeaveBalanceComputationService
    private const float STANDARD_SATURDAY_ACCRUAL_PER_MONTH = self::STANDARD_ANNUAL_SATURDAYS / 12.0;
    private const float FOUR_HOUR_ANNUAL_DAYS               = 10.0;
    private const float FOUR_HOUR_ACCRUAL_PER_MONTH         = 0.83;
+    private const float LONG_MALADIE_MONTHLY_ACCRUAL        = 2.0;

    public function __construct(
        private AbsenceRepository $absenceRepository,
@@ -31,6 +32,7 @@ final readonly class LeaveBalanceComputationService
        private EmployeeLeaveBalanceRepository $leaveBalanceRepository,
        private PublicHolidayServiceInterface $publicHolidayService,
        private SuspensionDaysCalculator $suspensionDaysCalculator,
+        private LongMaladieService $longMaladieService,
    ) {}

    /**
@@ -83,19 +85,34 @@ final readonly class LeaveBalanceComputationService
            $suspensions = $this->suspensionDaysCalculator->applyFirstMonthGrace(
                $this->resolveSuspensionsForEmployeePeriod($employee, $from, $to)
            );
+
+            $longMaladiePeriods         = [];
+            $longMaladieReductionFactor = 1.0;
+            if (4 !== $employee->getContract()?->getWeeklyHours()) {
+                $longMaladiePeriods = $this->longMaladieService->findReducedRatePeriods($employee, $effectiveFrom, $to);
+                if ([] !== $longMaladiePeriods) {
+                    $totalNormalAccrual         = $this->resolveDaysAccrualPerMonth($employee) + $this->resolveSaturdayAccrualPerMonth($employee);
+                    $longMaladieReductionFactor = self::LONG_MALADIE_MONTHLY_ACCRUAL / $totalNormalAccrual;
+                }
+            }
+
            $generatedDays = $this->computeAccruedDays(
                $this->resolveAnnualDays($employee),
                $this->resolveDaysAccrualPerMonth($employee),
                $effectiveFrom,
                $to,
-                $suspensions
+                $suspensions,
+                $longMaladiePeriods,
+                $longMaladieReductionFactor
            );
            $generatedSaturdays = $this->computeAccruedDays(
                $this->resolveAnnualSaturdays($employee),
                $this->resolveSaturdayAccrualPerMonth($employee),
                $effectiveFrom,
                $to,
-                $suspensions
+                $suspensions,
+                $longMaladiePeriods,
+                $longMaladieReductionFactor
            );

            $absences                     = $this->absenceRepository->findByEmployeeAndOverlappingDateRange($employee, $effectiveFrom, $to);
@@ -267,21 +284,29 @@ final readonly class LeaveBalanceComputationService
            : self::STANDARD_SATURDAY_ACCRUAL_PER_MONTH;
    }

+    /**
+     * @param list<ContractSuspension>                                      $suspensions
+     * @param list<array{start: DateTimeImmutable, end: DateTimeImmutable}> $longMaladiePeriods
+     */
    private function computeAccruedDays(
        float $annualCap,
        float $accrualPerMonth,
        DateTimeImmutable $periodStart,
        DateTimeImmutable $periodEnd,
-        array $suspensions = []
+        array $suspensions = [],
+        array $longMaladiePeriods = [],
+        float $longMaladieReductionFactor = 1.0
    ): float {
        if ($accrualPerMonth <= 0.0 || $periodEnd < $periodStart) {
            return 0.0;
        }

-        $periodStart   = $this->normalizeDate($periodStart);
-        $periodEnd     = $this->normalizeDate($periodEnd);
-        $coveredMonths = 0.0;
-        $cursor        = $periodStart->modify('first day of this month')->setTime(0, 0);
+        $periodStart    = $this->normalizeDate($periodStart);
+        $periodEnd      = $this->normalizeDate($periodEnd);
+        $publicHolidays = [] !== $suspensions ? $this->buildPublicHolidayMap($periodStart, $periodEnd) : [];
+        $normalMonths   = 0.0;
+        $reducedMonths  = 0.0;
+        $cursor         = $periodStart->modify('first day of this month')->setTime(0, 0);
        while ($cursor <= $periodEnd) {
            $monthStart = $cursor > $periodStart ? $cursor : $periodStart;
            $monthEnd   = $cursor->modify('last day of this month')->setTime(0, 0);
@@ -289,18 +314,39 @@ final readonly class LeaveBalanceComputationService
                $monthEnd = $periodEnd;
            }

-            $coveredDays = ((int) $monthEnd->diff($monthStart)->format('%a')) + 1;
            if ([] !== $suspensions) {
                $suspendedDays = $this->suspensionDaysCalculator->countSuspendedDaysInMonth($monthStart, $monthEnd, $suspensions);
-                $coveredDays   = max(0, $coveredDays - $suspendedDays);
+                if ($suspendedDays > 0) {
+                    $businessDays          = $this->countBusinessDaysInRange($monthStart, $monthEnd, $publicHolidays);
+                    $suspendedBusinessDays = $this->suspensionDaysCalculator->countSuspendedBusinessDays($monthStart, $monthEnd, $suspensions, $publicHolidays);
+                    $normalMonths += max(0, $businessDays - $suspendedBusinessDays) / 22.0;
+                    $cursor = $cursor->modify('first day of next month');
+
+                    continue;
+                }
            }
+
+            $coveredDays = ((int) $monthEnd->diff($monthStart)->format('%a')) + 1;
            $daysInMonth = (int) $cursor->format('t');
-            $coveredMonths += $coveredDays / $daysInMonth;
+
+            if ([] !== $longMaladiePeriods) {
+                $reducedDays = $this->longMaladieService->countReducedDaysInMonth($monthStart, $monthEnd, $longMaladiePeriods);
+                if ($reducedDays > 0) {
+                    $normalDays = max(0, $coveredDays - $reducedDays);
+                    $normalMonths += $normalDays / $daysInMonth;
+                    $reducedMonths += min($coveredDays, $reducedDays) / $daysInMonth;
+                    $cursor = $cursor->modify('first day of next month');
+
+                    continue;
+                }
+            }
+
+            $normalMonths += $coveredDays / $daysInMonth;

            $cursor = $cursor->modify('first day of next month');
        }

-        return min($annualCap, $coveredMonths * $accrualPerMonth);
+        return min($annualCap, ($normalMonths + $reducedMonths * $longMaladieReductionFactor) * $accrualPerMonth);
    }

    private function parseYmdDate(string $value): ?DateTimeImmutable
@@ -317,8 +363,15 @@ final readonly class LeaveBalanceComputationService

    private function countBusinessDays(DateTimeImmutable $from, DateTimeImmutable $to): int
    {
-        $publicHolidays = $this->buildPublicHolidayMap($from, $to);
-        $count          = 0;
+        return $this->countBusinessDaysInRange($from, $to, $this->buildPublicHolidayMap($from, $to));
+    }
+
+    /**
+     * @param array<string, string> $publicHolidays pre-built map
+     */
+    private function countBusinessDaysInRange(DateTimeImmutable $from, DateTimeImmutable $to, array $publicHolidays): int
+    {
+        $count = 0;
        for ($cursor = $from; $cursor <= $to; $cursor = $cursor->modify('+1 day')) {
            $weekDay = (int) $cursor->format('N');
            $dayKey  = $cursor->format('Y-m-d');
--- a/src/Service/Leave/LongMaladieService.php
+++ b/src/Service/Leave/LongMaladieService.php
@@ -0,0 +1,116 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service\Leave;
+
+use App\Entity\Employee;
+use App\Repository\AbsenceRepository;
+use DateTimeImmutable;
+
+use function count;
+
+/**
+ * Detects continuous MALADIE (sick leave) periods and computes
+ * the date ranges where reduced accrual applies (after the first month grace).
+ */
+final readonly class LongMaladieService
+{
+    private const int MAX_GAP_DAYS = 3;
+
+    public function __construct(
+        private AbsenceRepository $absenceRepository,
+    ) {}
+
+    /**
+     * Returns date ranges where the reduced maladie accrual rate applies.
+     * For continuous maladie periods > 1 month, the first month is excluded (grace period).
+     *
+     * @return list<array{start: DateTimeImmutable, end: DateTimeImmutable}>
+     */
+    public function findReducedRatePeriods(
+        Employee $employee,
+        DateTimeImmutable $from,
+        DateTimeImmutable $to
+    ): array {
+        // Look back 13 months to catch maladie that started before the exercise period
+        $extendedFrom = $from->modify('-13 months');
+        $dates        = $this->absenceRepository->findMaladieDatesByEmployee($employee, $extendedFrom, $to);
+        if ([] === $dates) {
+            return [];
+        }
+
+        $periods = $this->consolidateIntoPeriods($dates);
+
+        return $this->applyFirstMonthGrace($periods);
+    }
+
+    /**
+     * Count calendar days in [monthStart, monthEnd] that fall within reduced maladie periods.
+     *
+     * @param list<array{start: DateTimeImmutable, end: DateTimeImmutable}> $reducedPeriods
+     */
+    public function countReducedDaysInMonth(
+        DateTimeImmutable $monthStart,
+        DateTimeImmutable $monthEnd,
+        array $reducedPeriods
+    ): int {
+        $total = 0;
+        foreach ($reducedPeriods as $period) {
+            $overlapStart = $period['start'] > $monthStart ? $period['start'] : $monthStart;
+            $overlapEnd   = $period['end'] < $monthEnd ? $period['end'] : $monthEnd;
+
+            if ($overlapStart > $overlapEnd) {
+                continue;
+            }
+
+            $total += ((int) $overlapEnd->diff($overlapStart)->format('%a')) + 1;
+        }
+
+        return $total;
+    }
+
+    /**
+     * @param list<DateTimeImmutable> $dates sorted chronologically
+     *
+     * @return list<array{start: DateTimeImmutable, end: DateTimeImmutable}>
+     */
+    private function consolidateIntoPeriods(array $dates): array
+    {
+        $periods = [];
+        $start   = $dates[0];
+        $prev    = $start;
+
+        for ($i = 1, $count = count($dates); $i < $count; ++$i) {
+            $current = $dates[$i];
+            $gap     = (int) $prev->diff($current)->format('%a');
+            if ($gap > self::MAX_GAP_DAYS) {
+                $periods[] = ['start' => $start, 'end' => $prev];
+                $start     = $current;
+            }
+            $prev = $current;
+        }
+        $periods[] = ['start' => $start, 'end' => $prev];
+
+        return $periods;
+    }
+
+    /**
+     * @param list<array{start: DateTimeImmutable, end: DateTimeImmutable}> $periods
+     *
+     * @return list<array{start: DateTimeImmutable, end: DateTimeImmutable}>
+     */
+    private function applyFirstMonthGrace(array $periods): array
+    {
+        $result = [];
+        foreach ($periods as $period) {
+            $gracedStart = $period['start']->modify('+1 month');
+            if ($gracedStart > $period['end']) {
+                continue;
+            }
+            $result[] = ['start' => $gracedStart, 'end' => $period['end']];
+        }
+
+        return $result;
+    }
+}
--- a/src/Service/PublicHolidayService.php
+++ b/src/Service/PublicHolidayService.php
@@ -6,6 +6,8 @@ namespace App\Service;

 use Exception;
 use RuntimeException;
+use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Cache\ItemInterface;
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
@@ -17,7 +19,8 @@ final readonly class PublicHolidayService implements PublicHolidayServiceInterfa
 {
    public function __construct(
        private HttpClientInterface $client,
-        private string $holidayUrl
+        private string $holidayUrl,
+        private CacheInterface $cache,
    ) {}

    /**
@@ -30,24 +33,29 @@ final readonly class PublicHolidayService implements PublicHolidayServiceInterfa
    public function getHolidaysDay(string $zone): array
    {
        $zone = strtolower(trim($zone));
-        $url  = $this->holidayUrl."{$zone}.json";
+        $key  = "public_holidays_{$zone}_all";

-        try {
-            $response = $this->client->request(
-                'GET',
-                $url
-            );
-        } catch (TransportExceptionInterface) {
-            throw new RuntimeException('Unable to reach public holidays API.');
-        } catch (ClientExceptionInterface) {
-            throw new RuntimeException('Invalid zone provided for public holidays.');
-        } catch (ServerExceptionInterface) {
-            throw new RuntimeException('Public holidays API is temporarily unavailable.');
-        } catch (Throwable) {
-            throw new RuntimeException('Unexpected error while fetching public holidays.');
-        }
+        return $this->cache->get($key, function (ItemInterface $item) use ($zone): array {
+            $item->expiresAfter(30 * 86400);
+            $url = $this->holidayUrl."{$zone}.json";

-        return json_decode($response->getContent(), true);
+            try {
+                $response = $this->client->request(
+                    'GET',
+                    $url
+                );
+            } catch (TransportExceptionInterface) {
+                throw new RuntimeException('Unable to reach public holidays API.');
+            } catch (ClientExceptionInterface) {
+                throw new RuntimeException('Invalid zone provided for public holidays.');
+            } catch (ServerExceptionInterface) {
+                throw new RuntimeException('Public holidays API is temporarily unavailable.');
+            } catch (Throwable) {
+                throw new RuntimeException('Unexpected error while fetching public holidays.');
+            }
+
+            return json_decode($response->getContent(), true);
+        });
    }

    /**
@@ -60,20 +68,25 @@ final readonly class PublicHolidayService implements PublicHolidayServiceInterfa
    {
        $zone  = strtolower(trim($zone));
        $years = trim($years);
-        $url   = $this->holidayUrl."{$zone}/{$years}.json";
+        $key   = "public_holidays_{$zone}_{$years}";

-        try {
-            $response = $this->client->request('GET', $url);
-        } catch (TransportExceptionInterface) {
-            throw new RuntimeException('Unable to reach public holidays API.');
-        } catch (ClientExceptionInterface) {
-            throw new RuntimeException('Invalid zone or year provided for public holidays.');
-        } catch (ServerExceptionInterface) {
-            throw new RuntimeException('Public holidays API is temporarily unavailable.');
-        } catch (Throwable) {
-            throw new RuntimeException('Unexpected error while fetching public holidays.');
-        }
+        return $this->cache->get($key, function (ItemInterface $item) use ($zone, $years): array {
+            $item->expiresAfter(30 * 86400);
+            $url = $this->holidayUrl."{$zone}/{$years}.json";

-        return json_decode($response->getContent(), true);
+            try {
+                $response = $this->client->request('GET', $url);
+            } catch (TransportExceptionInterface) {
+                throw new RuntimeException('Unable to reach public holidays API.');
+            } catch (ClientExceptionInterface) {
+                throw new RuntimeException('Invalid zone or year provided for public holidays.');
+            } catch (ServerExceptionInterface) {
+                throw new RuntimeException('Public holidays API is temporarily unavailable.');
+            } catch (Throwable) {
+                throw new RuntimeException('Unexpected error while fetching public holidays.');
+            }
+
+            return json_decode($response->getContent(), true);
+        });
    }
 }
--- a/src/Service/Rtt/RttRecoveryComputationService.php
+++ b/src/Service/Rtt/RttRecoveryComputationService.php
@@ -21,13 +21,18 @@ use DateTimeImmutable;

 final readonly class RttRecoveryComputationService
 {
+    private ?DateTimeImmutable $rttStartDate;
+
    public function __construct(
        private WorkHourRepository $workHourRepository,
        private AbsenceRepository $absenceRepository,
        private AbsenceSegmentsResolver $absenceSegmentsResolver,
        private WorkedHoursCreditPolicy $workedHoursCreditPolicy,
        private EmployeeContractResolver $contractResolver,
-    ) {}
+        string $rttStartDate = '',
+    ) {
+        $this->rttStartDate = '' !== $rttStartDate ? new DateTimeImmutable($rttStartDate) : null;
+    }

    /**
     * @return array{DateTimeImmutable, DateTimeImmutable}
@@ -71,7 +76,7 @@ final readonly class RttRecoveryComputationService
        return $weeks;
    }

-    public function computeTotalRecoveryForExercise(Employee $employee, int $exerciseYear): WeekRecoveryDetail
+    public function computeTotalRecoveryForExercise(Employee $employee, int $exerciseYear, ?DateTimeImmutable $limitDate = null): WeekRecoveryDetail
    {
        [$from, $to] = $this->resolveExerciseBounds($exerciseYear);
        $weeks       = $this->buildWeeksForExercise($from, $to);
@@ -85,7 +90,7 @@ final readonly class RttRecoveryComputationService
            $weeks
        );

-        $byWeek = $this->computeRecoveryByWeek($employee, $weekRanges, $from, $to, null);
+        $byWeek = $this->computeRecoveryByWeek($employee, $weekRanges, $from, $to, $limitDate);

        $total = new WeekRecoveryDetail();
        foreach ($byWeek as $detail) {
@@ -172,6 +177,12 @@ final readonly class RttRecoveryComputationService
                continue;
            }

+            if ($this->rttStartDate instanceof DateTimeImmutable && $effectiveEnd < $this->rttStartDate) {
+                $results[$weekKey] = new WeekRecoveryDetail();
+
+                continue;
+            }
+
            $weekDays = [];
            for ($cursor = $effectiveStart; $cursor <= $effectiveEnd; $cursor = $cursor->modify('+1 day')) {
                $weekDays[] = $cursor->format('Y-m-d');
@@ -203,7 +214,7 @@ final readonly class RttRecoveryComputationService
            $overtime25StartMinutes     = $this->computeWeeklyOvertime25StartMinutes($weekDays, $employeeContractsByDate);
            $weeklyOvertimeTotalMinutes = $isWeekPresenceTracking
                ? 0
-                : max(0, $weeklyTotalMinutes - $overtimeReferenceMinutes);
+                : $weeklyTotalMinutes - $overtimeReferenceMinutes;

            $base25  = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : max(0, min($weeklyTotalMinutes, 43 * 60) - $overtime25StartMinutes);
            $bonus25 = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : (int) round($base25 * 0.25);
--- a/src/State/EmployeeLeaveSummaryProvider.php
+++ b/src/State/EmployeeLeaveSummaryProvider.php
@@ -21,6 +21,7 @@ use App\Repository\EmployeeRepository;
 use App\Repository\WorkHourRepository;
 use App\Security\EmployeeScopeService;
 use App\Service\Leave\LeaveBalanceComputationService;
+use App\Service\Leave\LongMaladieService;
 use App\Service\Leave\SuspensionDaysCalculator;
 use App\Service\PublicHolidayServiceInterface;
 use DateTimeImmutable;
@@ -42,6 +43,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
    private const float CDI_NON_FORFAIT_4H_ACQUIRED_SATURDAYS               = 0.0;
    private const float CDI_NON_FORFAIT_4H_ACCRUAL_PER_MONTH                = 0.83;
    private const float CDI_NON_FORFAIT_4H_SATURDAY_ACCRUAL_PER_MONTH       = 0.0;
+    private const float LONG_MALADIE_MONTHLY_ACCRUAL                        = 2.0;

    public function __construct(
        private Security $security,
@@ -52,6 +54,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
        private EmployeeContractPeriodRepository $periodRepository,
        private EmployeeLeaveBalanceRepository $leaveBalanceRepository,
        private LeaveBalanceComputationService $leaveBalanceComputationService,
+        private LongMaladieService $longMaladieService,
        private PublicHolidayServiceInterface $publicHolidayService,
        private SuspensionDaysCalculator $suspensionDaysCalculator,
        private WorkHourRepository $workHourRepository,
@@ -126,9 +129,9 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
     *   previousYearRemainingDays: float
     * }
     */
-    private function computeYearSummary(Employee $employee, int $targetYear): ?array
+    public function computeYearSummary(Employee $employee, int $targetYear): ?array
    {
-        $firstYear = $this->resolveFirstComputationYear($employee);
+        $firstYear = max($this->resolveFirstComputationYear($employee), $targetYear - 1);
        if ($targetYear < $firstYear) {
            $targetYear = $firstYear;
        }
@@ -187,13 +190,29 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
            $suspensions           = $this->suspensionDaysCalculator->applyFirstMonthGrace(
                $this->resolveSuspensionsForPeriod($employee, $effectiveFrom, $to)
            );
+
+            $longMaladiePeriods         = [];
+            $longMaladieReductionFactor = 1.0;
+            if (LeaveRuleCode::CDI_CDD_NON_FORFAIT->value === $leavePolicy['ruleCode']
+                && 4 !== $employee->getContract()?->getWeeklyHours()
+                && null !== $accrualCalculationEnd
+            ) {
+                $longMaladiePeriods = $this->longMaladieService->findReducedRatePeriods($employee, $effectiveFrom, $accrualCalculationEnd);
+                if ([] !== $longMaladiePeriods) {
+                    $totalNormalAccrual         = $leavePolicy['accrualPerMonth'] + $leavePolicy['saturdayAccrualPerMonth'];
+                    $longMaladieReductionFactor = self::LONG_MALADIE_MONTHLY_ACCRUAL / $totalNormalAccrual;
+                }
+            }
+
            $generatedDays = $leavePolicy['accrualPerMonth'] > 0.0
                ? $this->computeAccruedDaysFromStart(
                    $leavePolicy['acquiredDays'],
                    $leavePolicy['accrualPerMonth'],
                    $effectiveFrom,
                    $accrualCalculationEnd,
-                    $suspensions
+                    $suspensions,
+                    $longMaladiePeriods,
+                    $longMaladieReductionFactor
                )
                : 0.0;
            $generatedSaturdays = $leavePolicy['saturdayAccrualPerMonth'] > 0.0
@@ -202,7 +221,9 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
                    $leavePolicy['saturdayAccrualPerMonth'],
                    $effectiveFrom,
                    $accrualCalculationEnd,
-                    $suspensions
+                    $suspensions,
+                    $longMaladiePeriods,
+                    $longMaladieReductionFactor
                )
                : 0.0;
            $absences                     = $this->absenceRepository->findByEmployeeAndOverlappingDateRange($employee, $from, $to);
@@ -286,6 +307,16 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
        return $targetSummary;
    }

+    public function resolveLeaveYearForToday(Employee $employee): int
+    {
+        $today = new DateTimeImmutable('today');
+        if (ContractType::FORFAIT === $employee->getContract()?->getType()) {
+            return (int) $today->format('Y');
+        }
+
+        return $this->resolveCurrentLeaveYear($today);
+    }
+
    private function resolveEffectivePeriodStart(
        Employee $employee,
        DateTimeImmutable $from,
@@ -365,12 +396,18 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
        return $year;
    }

+    /**
+     * @param list<ContractSuspension>                                      $suspensions
+     * @param list<array{start: DateTimeImmutable, end: DateTimeImmutable}> $longMaladiePeriods
+     */
    private function computeAccruedDaysFromStart(
        float $acquiredDays,
        float $accrualPerMonth,
        DateTimeImmutable $periodStart,
        ?DateTimeImmutable $periodEnd,
-        array $suspensions = []
+        array $suspensions = [],
+        array $longMaladiePeriods = [],
+        float $longMaladieReductionFactor = 1.0
    ): float {
        if ($accrualPerMonth <= 0.0) {
            return $acquiredDays;
@@ -380,10 +417,12 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
            return 0.0;
        }

-        $periodStart   = $this->normalizeDate($periodStart);
-        $periodEnd     = $this->normalizeDate($periodEnd);
-        $coveredMonths = 0.0;
-        $cursor        = $periodStart->modify('first day of this month')->setTime(0, 0);
+        $periodStart    = $this->normalizeDate($periodStart);
+        $periodEnd      = $this->normalizeDate($periodEnd);
+        $publicHolidays = [] !== $suspensions ? $this->buildPublicHolidayMap($periodStart, $periodEnd) : [];
+        $normalMonths   = 0.0;
+        $reducedMonths  = 0.0;
+        $cursor         = $periodStart->modify('first day of this month')->setTime(0, 0);
        while ($cursor <= $periodEnd) {
            $monthStart = $cursor > $periodStart ? $cursor : $periodStart;
            $monthEnd   = $cursor->modify('last day of this month')->setTime(0, 0);
@@ -391,18 +430,39 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
                $monthEnd = $periodEnd;
            }

-            $coveredDays = ((int) $monthEnd->diff($monthStart)->format('%a')) + 1;
            if ([] !== $suspensions) {
                $suspendedDays = $this->suspensionDaysCalculator->countSuspendedDaysInMonth($monthStart, $monthEnd, $suspensions);
-                $coveredDays   = max(0, $coveredDays - $suspendedDays);
+                if ($suspendedDays > 0) {
+                    $businessDays          = $this->countBusinessDays($monthStart, $monthEnd, $publicHolidays);
+                    $suspendedBusinessDays = $this->suspensionDaysCalculator->countSuspendedBusinessDays($monthStart, $monthEnd, $suspensions, $publicHolidays);
+                    $normalMonths += max(0, $businessDays - $suspendedBusinessDays) / 22.0;
+                    $cursor = $cursor->modify('first day of next month');
+
+                    continue;
+                }
            }
+
+            $coveredDays = ((int) $monthEnd->diff($monthStart)->format('%a')) + 1;
            $daysInMonth = (int) $cursor->format('t');
-            $coveredMonths += $coveredDays / $daysInMonth;
+
+            if ([] !== $longMaladiePeriods) {
+                $reducedDays = $this->longMaladieService->countReducedDaysInMonth($monthStart, $monthEnd, $longMaladiePeriods);
+                if ($reducedDays > 0) {
+                    $normalDays = max(0, $coveredDays - $reducedDays);
+                    $normalMonths += $normalDays / $daysInMonth;
+                    $reducedMonths += min($coveredDays, $reducedDays) / $daysInMonth;
+                    $cursor = $cursor->modify('first day of next month');
+
+                    continue;
+                }
+            }
+
+            $normalMonths += $coveredDays / $daysInMonth;

            $cursor = $cursor->modify('first day of next month');
        }

-        return min($acquiredDays, $coveredMonths * $accrualPerMonth);
+        return min($acquiredDays, ($normalMonths + $reducedMonths * $longMaladieReductionFactor) * $accrualPerMonth);
    }

    private function resolveAccrualCalculationEndDate(
@@ -516,10 +576,13 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
        ];
    }

-    private function countBusinessDays(DateTimeImmutable $from, DateTimeImmutable $to): int
+    /**
+     * @param null|array<string, string> $publicHolidays pre-built map (built if null)
+     */
+    private function countBusinessDays(DateTimeImmutable $from, DateTimeImmutable $to, ?array $publicHolidays = null): int
    {
-        $publicHolidays = $this->buildPublicHolidayMap($from, $to);
-        $count          = 0;
+        $publicHolidays ??= $this->buildPublicHolidayMap($from, $to);
+        $count = 0;
        for ($cursor = $from; $cursor <= $to; $cursor = $cursor->modify('+1 day')) {
            $weekDay = (int) $cursor->format('N');
            $dayKey  = $cursor->format('Y-m-d');
--- a/src/State/EmployeeRttSummaryProvider.php
+++ b/src/State/EmployeeRttSummaryProvider.php
@@ -15,6 +15,7 @@ use App\Entity\User;
 use App\Repository\EmployeeRepository;
 use App\Repository\EmployeeRttBalanceRepository;
 use App\Repository\EmployeeRttPaymentRepository;
+use App\Repository\WorkHourRepository;
 use App\Security\EmployeeScopeService;
 use App\Service\Rtt\RttRecoveryComputationService;
 use DateTimeImmutable;
@@ -26,6 +27,8 @@ use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;

 final readonly class EmployeeRttSummaryProvider implements ProviderInterface
 {
+    private ?string $rttStartDate;
+
    public function __construct(
        private Security $security,
        private RequestStack $requestStack,
@@ -34,7 +37,11 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
        private EmployeeRttBalanceRepository $rttBalanceRepository,
        private EmployeeRttPaymentRepository $rttPaymentRepository,
        private RttRecoveryComputationService $rttRecoveryService,
-    ) {}
+        private WorkHourRepository $workHourRepository,
+        string $rttStartDate = '',
+    ) {
+        $this->rttStartDate = '' !== $rttStartDate ? $rttStartDate : null;
+    }

    public function provide(Operation $operation, array $uriVariables = [], array $context = []): EmployeeRttSummary
    {
@@ -72,9 +79,22 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
            $weeks
        );

-        $limitDate = null;
        if ($year > $currentExerciseYear) {
            $limitDate = $periodFrom->modify('-1 day');
+        } else {
+            // Exclude the current (incomplete) week: limit to last Sunday
+            $isoDay    = (int) $today->format('N'); // 1=Monday .. 7=Sunday
+            $limitDate = 7 === $isoDay ? $today : $today->modify('last sunday');
+
+            // Include the current week if all existing days are admin-validated
+            if (7 !== $isoDay) {
+                $currentWeekStart = $today->modify('monday this week');
+                $currentWeekEnd   = $currentWeekStart->modify('+6 days');
+                $checkEnd         = $this->resolveWeekEndForEmployee($employee, $currentWeekStart, $currentWeekEnd, $today);
+                if ($this->workHourRepository->isWeekFullyValidated($employee, $currentWeekStart, $checkEnd)) {
+                    $limitDate = $currentWeekEnd;
+                }
+            }
        }

        $currentByWeekStart   = $this->rttRecoveryService->computeRecoveryByWeek($employee, $weekRanges, $periodFrom, $periodTo, $limitDate);
@@ -90,7 +110,15 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
        $summary->carryBonus50Minutes          = $carry->bonus50Minutes;
        $summary->currentYearRecoveryMinutes   = array_sum(array_map(static fn ($d) => $d->totalMinutes, $currentByWeekStart));
        $summary->availableMinutes             = $summary->carryFromPreviousYearMinutes + $summary->currentYearRecoveryMinutes;
-        $summary->weeks                        = array_map(
+
+        // Pass rttStartDate only if it falls within this exercise
+        if (null !== $this->rttStartDate) {
+            $startDate = new DateTimeImmutable($this->rttStartDate);
+            if ($startDate >= $periodFrom && $startDate <= $periodTo) {
+                $summary->rttStartDate = $this->rttStartDate;
+            }
+        }
+        $summary->weeks = array_map(
            static function (array $week) use ($currentByWeekStart) {
                $detail = $currentByWeekStart[$week['start']->format('Y-m-d')] ?? new WeekRecoveryDetail();

@@ -110,6 +138,37 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
            $weekRanges
        );

+        // Post-process: distribute deficit weeks across cumulative balance (50% first, then 25%)
+        $cumulative50 = $carry->base50Minutes + $carry->bonus50Minutes;
+        $cumulative25 = $carry->base25Minutes + $carry->bonus25Minutes;
+
+        foreach ($summary->weeks as $i => $week) {
+            if ($week->totalMinutes >= 0) {
+                $cumulative50 += $week->base50Minutes + $week->bonus50Minutes;
+                $cumulative25 += $week->base25Minutes + $week->bonus25Minutes;
+            } else {
+                $deficit = -$week->totalMinutes;
+                $from50  = min($deficit, max(0, $cumulative50));
+                $from25  = $deficit - $from50;
+
+                $cumulative50 -= $from50;
+                $cumulative25 -= $from25;
+
+                $summary->weeks[$i] = new EmployeeRttWeekSummary(
+                    month: $week->month,
+                    weekNumber: $week->weekNumber,
+                    weekStart: $week->weekStart,
+                    weekEnd: $week->weekEnd,
+                    overtimeMinutes: $week->overtimeMinutes,
+                    base25Minutes: $from25 > 0 ? -$from25 : 0,
+                    bonus25Minutes: 0,
+                    base50Minutes: $from50 > 0 ? -$from50 : 0,
+                    bonus50Minutes: 0,
+                    totalMinutes: $week->totalMinutes,
+                );
+            }
+        }
+
        $payments     = $this->rttPaymentRepository->findByEmployeeAndYear($employee, $year);
        $monthBuckets = [];

@@ -189,4 +248,25 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface

        return $month >= 6 ? $year + 1 : $year;
    }
+
+    /**
+     * If the employee's contract ends within the current week, cap the check range to that end date.
+     */
+    private function resolveWeekEndForEmployee(Employee $employee, DateTimeImmutable $weekStart, DateTimeImmutable $weekEnd, DateTimeImmutable $today): DateTimeImmutable
+    {
+        foreach ($employee->getContractPeriods() as $period) {
+            if ($period->getStartDate() > $today) {
+                continue;
+            }
+            $endDate = $period->getEndDate();
+            if (null === $endDate) {
+                continue;
+            }
+            if ($endDate >= $weekStart && $endDate <= $weekEnd) {
+                return $endDate;
+            }
+        }
+
+        return $weekEnd;
+    }
 }
--- a/src/State/LeaveRecapPrintProvider.php
+++ b/src/State/LeaveRecapPrintProvider.php
@@ -0,0 +1,211 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use App\Entity\Employee;
+use App\Enum\ContractNature;
+use App\Enum\ContractType;
+use App\Enum\TrackingMode;
+use App\Repository\EmployeeRepository;
+use App\Repository\EmployeeRttBalanceRepository;
+use App\Repository\EmployeeRttPaymentRepository;
+use App\Repository\WorkHourRepository;
+use App\Service\Rtt\RttRecoveryComputationService;
+use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+use Dompdf\Dompdf;
+use Dompdf\Options;
+use Symfony\Component\HttpFoundation\Response;
+use Throwable;
+use Twig\Environment;
+
+class LeaveRecapPrintProvider implements ProviderInterface
+{
+    public function __construct(
+        private Environment $twig,
+        private EmployeeRepository $employeeRepository,
+        private EmployeeLeaveSummaryProvider $leaveSummaryProvider,
+        private RttRecoveryComputationService $rttRecoveryService,
+        private EmployeeRttBalanceRepository $rttBalanceRepository,
+        private EmployeeRttPaymentRepository $rttPaymentRepository,
+        private EntityManagerInterface $entityManager,
+        private WorkHourRepository $workHourRepository,
+    ) {}
+
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
+    {
+        $today     = new DateTimeImmutable('today');
+        $employees = $this->employeeRepository->findForPrintBySiteIds([]);
+
+        $siteGroups = [];
+
+        foreach ($employees as $employee) {
+            if (!$employee->getHasActiveContract()) {
+                continue;
+            }
+
+            $site   = $employee->getSite();
+            $siteId = $site ? $site->getId() : 0;
+
+            if (!isset($siteGroups[$siteId])) {
+                $siteGroups[$siteId] = [
+                    'name'      => $site ? $site->getName() : 'Sans site',
+                    'color'     => $site?->getColor() ?? '#ffd7d7',
+                    'employees' => [],
+                ];
+            }
+
+            $siteGroups[$siteId]['employees'][] = $this->buildEmployeeRow($employee, $today);
+            $this->entityManager->clear();
+        }
+
+        // Re-load Twig environment after clear
+        $options = new Options();
+        $options->set('isRemoteEnabled', true);
+
+        $dompdf = new Dompdf($options);
+        $html   = $this->twig->render('leave-recap/print.html.twig', [
+            'today'      => $today,
+            'siteGroups' => $siteGroups,
+        ]);
+
+        $dompdf->loadHtml($html);
+        $dompdf->setPaper('A4', 'portrait');
+        $dompdf->render();
+
+        $filename = sprintf('recap_conges_%s.pdf', $today->format('Y-m-d'));
+
+        return new Response($dompdf->output(), Response::HTTP_OK, [
+            'Content-Type'        => 'application/pdf',
+            'Content-Disposition' => 'inline; filename="'.$filename.'"',
+        ]);
+    }
+
+    private function buildEmployeeRow(Employee $employee, DateTimeImmutable $today): array
+    {
+        $contract     = $employee->getContract();
+        $contractName = $contract?->getName();
+        $isForfait    = ContractType::FORFAIT === $contract?->getType();
+        $nature       = ContractNature::tryFrom($employee->getCurrentContractNature());
+        $isInterim    = ContractNature::INTERIM === $nature;
+
+        $cpN1Remaining     = 0.0;
+        $cpN               = '-';
+        $acquiredSaturdays = '-';
+        $rtt               = '-';
+
+        if (!$isInterim) {
+            $leaveYear   = $this->leaveSummaryProvider->resolveLeaveYearForToday($employee);
+            $yearSummary = $this->leaveSummaryProvider->computeYearSummary($employee, $leaveYear);
+
+            if (null !== $yearSummary) {
+                if ($isForfait) {
+                    $cpN1Remaining     = round($yearSummary['previousYearRemainingDays'], 2);
+                    $cpN               = (string) round($yearSummary['acquiredDays'], 2);
+                    $acquiredSaturdays = '-';
+                } else {
+                    $cpN1Remaining     = round($yearSummary['remainingDays'], 2);
+                    $cpN               = (string) round($yearSummary['accruingDays'], 2);
+                    $acquiredSaturdays = (string) round($yearSummary['remainingSaturdays'], 2);
+                }
+            }
+
+            if (!$isForfait && TrackingMode::PRESENCE->value !== $contract?->getTrackingMode()) {
+                try {
+                    $rtt = $this->formatMinutes($this->computeAvailableRttMinutes($employee, $today));
+                } catch (Throwable) {
+                    $rtt = '-';
+                }
+            }
+        }
+
+        return [
+            'lastName'          => $employee->getLastName(),
+            'firstName'         => $employee->getFirstName(),
+            'contractName'      => $contractName,
+            'cpN1Remaining'     => $cpN1Remaining,
+            'cpN'               => $cpN,
+            'acquiredSaturdays' => $acquiredSaturdays,
+            'rtt'               => $rtt,
+        ];
+    }
+
+    private function computeAvailableRttMinutes(Employee $employee, DateTimeImmutable $today): int
+    {
+        $month        = (int) $today->format('n');
+        $year         = (int) $today->format('Y');
+        $exerciseYear = $month >= 6 ? $year + 1 : $year;
+
+        // Exclude incomplete current week: limit to last Sunday
+        $isoDay    = (int) $today->format('N');
+        $limitDate = 7 === $isoDay ? $today : $today->modify('last sunday');
+
+        // Include the current week if all existing days are admin-validated
+        if (7 !== $isoDay) {
+            $currentWeekStart = $today->modify('monday this week');
+            $currentWeekEnd   = $currentWeekStart->modify('+6 days');
+            $checkEnd         = $this->resolveWeekEndForEmployee($employee, $currentWeekStart, $currentWeekEnd, $today);
+            if ($this->workHourRepository->isWeekFullyValidated($employee, $currentWeekStart, $checkEnd)) {
+                $limitDate = $currentWeekEnd;
+            }
+        }
+
+        // Carry from previous exercise
+        $carry   = 0;
+        $balance = $this->rttBalanceRepository->findOneByEmployeeAndYear($employee, $exerciseYear);
+        if (null !== $balance) {
+            $carry = $balance->getTotalOpeningMinutes();
+        } else {
+            $previousTotal = $this->rttRecoveryService->computeTotalRecoveryForExercise($employee, $exerciseYear - 1);
+            $carry         = $previousTotal->totalMinutes;
+        }
+
+        // Current exercise (limited to completed weeks)
+        $current = $this->rttRecoveryService->computeTotalRecoveryForExercise($employee, $exerciseYear, $limitDate);
+
+        // Paid RTT
+        $paid     = 0;
+        $payments = $this->rttPaymentRepository->findByEmployeeAndYear($employee, $exerciseYear);
+        foreach ($payments as $payment) {
+            $paid += $payment->getBase25Minutes() + $payment->getBase50Minutes();
+        }
+
+        return $carry + $current->totalMinutes - $paid;
+    }
+
+    private function resolveWeekEndForEmployee(Employee $employee, DateTimeImmutable $weekStart, DateTimeImmutable $weekEnd, DateTimeImmutable $today): DateTimeImmutable
+    {
+        foreach ($employee->getContractPeriods() as $period) {
+            if ($period->getStartDate() > $today) {
+                continue;
+            }
+            $endDate = $period->getEndDate();
+            if (null === $endDate) {
+                continue;
+            }
+            if ($endDate >= $weekStart && $endDate <= $weekEnd) {
+                return $endDate;
+            }
+        }
+
+        return $weekEnd;
+    }
+
+    private function formatMinutes(int $minutes): string
+    {
+        if (0 === $minutes) {
+            return '0 h';
+        }
+
+        $sign = $minutes < 0 ? '- ' : '';
+        $abs  = abs($minutes);
+        $h    = intdiv($abs, 60);
+        $m    = $abs % 60;
+
+        return 0 === $m ? "{$sign}{$h} h" : "{$sign}{$h} h {$m} m";
+    }
+}
--- a/src/State/MileageAllowanceAmountReceiptDownloadProvider.php
+++ b/src/State/MileageAllowanceAmountReceiptDownloadProvider.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use App\Entity\MileageAllowance;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\HeaderUtils;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+final readonly class MileageAllowanceAmountReceiptDownloadProvider implements ProviderInterface
+{
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+        #[Autowire('%kernel.project_dir%/var/uploads')]
+        private string $uploadDir,
+    ) {}
+
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): BinaryFileResponse
+    {
+        $mileageAllowance = $this->entityManager->find(MileageAllowance::class, $uriVariables['id']);
+
+        if (null === $mileageAllowance) {
+            throw new NotFoundHttpException('Mileage allowance not found.');
+        }
+
+        $receiptPath = $mileageAllowance->getAmountReceiptPath();
+
+        if (null === $receiptPath) {
+            throw new NotFoundHttpException('No amount receipt found for this mileage allowance.');
+        }
+
+        $absolutePath = sprintf('%s/%s', $this->uploadDir, $receiptPath);
+
+        if (!file_exists($absolutePath)) {
+            throw new NotFoundHttpException('Amount receipt file not found.');
+        }
+
+        $response    = new BinaryFileResponse($absolutePath);
+        $disposition = HeaderUtils::makeDisposition(
+            HeaderUtils::DISPOSITION_ATTACHMENT,
+            $mileageAllowance->getAmountReceiptName() ?? 'justificatif.pdf'
+        );
+        $response->headers->set('Content-Disposition', $disposition);
+
+        return $response;
+    }
+}
--- a/src/State/MileageAllowanceAmountReceiptUploadProcessor.php
+++ b/src/State/MileageAllowanceAmountReceiptUploadProcessor.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use App\Entity\MileageAllowance;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Uid\Uuid;
+
+final readonly class MileageAllowanceAmountReceiptUploadProcessor implements ProcessorInterface
+{
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+        private RequestStack $requestStack,
+        #[Autowire('%kernel.project_dir%/var/uploads')]
+        private string $uploadDir,
+    ) {}
+
+    public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): JsonResponse
+    {
+        if (!$data instanceof MileageAllowance) {
+            throw new BadRequestHttpException('Invalid entity.');
+        }
+
+        $request = $this->requestStack->getCurrentRequest();
+        $file    = $request?->files->get('file');
+
+        if (null === $file) {
+            throw new BadRequestHttpException('No file uploaded.');
+        }
+
+        if ('application/pdf' !== $file->getMimeType()) {
+            throw new BadRequestHttpException('Only PDF files are accepted.');
+        }
+
+        $month        = $data->getMonth();
+        $year         = $month?->format('Y') ?? date('Y');
+        $monthNumber  = $month?->format('m') ?? date('m');
+        $relativePath = sprintf('mileage-receipts/%s/%s', $year, $monthNumber);
+        $absoluteDir  = sprintf('%s/%s', $this->uploadDir, $relativePath);
+
+        if (!is_dir($absoluteDir)) {
+            mkdir($absoluteDir, 0o755, true);
+        }
+
+        $filename     = Uuid::v4()->toRfc4122().'.pdf';
+        $fullRelative = sprintf('%s/%s', $relativePath, $filename);
+        $originalName = $file->getClientOriginalName();
+
+        $file->move($absoluteDir, $filename);
+
+        $data->setAmountReceiptPath($fullRelative);
+        $data->setAmountReceiptName($originalName);
+        $this->entityManager->flush();
+
+        return new JsonResponse(['path' => $fullRelative, 'name' => $originalName], Response::HTTP_OK);
+    }
+}
--- a/src/State/MileageAllowanceDeleteProcessor.php
+++ b/src/State/MileageAllowanceDeleteProcessor.php
@@ -34,6 +34,16 @@ final readonly class MileageAllowanceDeleteProcessor implements ProcessorInterfa
            }
        }

+        $amountReceiptPath = $data->getAmountReceiptPath();
+
+        if (null !== $amountReceiptPath) {
+            $absolutePath = sprintf('%s/%s', $this->uploadDir, $amountReceiptPath);
+
+            if (file_exists($absolutePath)) {
+                unlink($absolutePath);
+            }
+        }
+
        $this->entityManager->remove($data);
        $this->entityManager->flush();

--- a/src/State/SalaryRecapPrintProvider.php
+++ b/src/State/SalaryRecapPrintProvider.php
@@ -0,0 +1,588 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use App\Entity\Absence;
+use App\Entity\Employee;
+use App\Entity\WorkHour;
+use App\Enum\TrackingMode;
+use App\Repository\AbsenceRepository;
+use App\Repository\BonusRepository;
+use App\Repository\EmployeeRepository;
+use App\Repository\EmployeeRttPaymentRepository;
+use App\Repository\MileageAllowanceRepository;
+use App\Repository\WorkHourRepository;
+use App\Service\Contracts\EmployeeContractResolver;
+use DateInterval;
+use DateTimeImmutable;
+use Dompdf\Dompdf;
+use Dompdf\Options;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Twig\Environment;
+
+class SalaryRecapPrintProvider implements ProviderInterface
+{
+    public function __construct(
+        private Environment $twig,
+        private readonly RequestStack $requestStack,
+        private EmployeeRepository $employeeRepository,
+        private WorkHourRepository $workHourRepository,
+        private AbsenceRepository $absenceRepository,
+        private EmployeeRttPaymentRepository $rttPaymentRepository,
+        private BonusRepository $bonusRepository,
+        private MileageAllowanceRepository $mileageAllowanceRepository,
+        private EmployeeContractResolver $contractResolver,
+    ) {}
+
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        if (!$request) {
+            return new Response('Missing request.', Response::HTTP_BAD_REQUEST);
+        }
+
+        $month = $request->query->get('month');
+        if (!$month || !preg_match('/^\d{4}-\d{2}$/', $month)) {
+            return new Response('Missing or invalid month query param (expected YYYY-MM).', Response::HTTP_BAD_REQUEST);
+        }
+
+        $from = DateTimeImmutable::createFromFormat('Y-m-d', $month.'-01');
+        $to   = $from->modify('last day of this month');
+
+        $employees = $this->employeeRepository->findForPrintBySiteIds([]);
+        $workHours = $this->workHourRepository->findByDateRangeAndEmployees($from, $to, $employees);
+        $absences  = $this->absenceRepository->findForPrint($from, $to, $employees);
+
+        $year        = (int) $from->format('Y');
+        $monthNumber = (int) $from->format('n');
+        $rttPayments = $this->rttPaymentRepository->findByYearAndMonth($year, $monthNumber);
+
+        $bonuses  = $this->bonusRepository->findByMonth($from, $to);
+        $mileages = $this->mileageAllowanceRepository->findByMonth($from, $to);
+
+        $days        = $this->buildDays($from, $to);
+        $contractMap = $this->contractResolver->resolveForEmployeesAndDays($employees, $days);
+        $driverMap   = $this->contractResolver->resolveIsDriverForEmployeesAndDays($employees, $days);
+
+        $workHourMap   = $this->buildWorkHourMap($workHours);
+        $absenceMap    = $this->buildAbsenceMap($absences);
+        $rttPaymentMap = $this->buildRttPaymentMap($rttPayments);
+        $bonusMap      = $this->buildBonusMap($bonuses);
+        $mileageMap    = $this->buildMileageMap($mileages);
+
+        $siteGroups = $this->aggregateBySite($employees, $days, $contractMap, $driverMap, $workHourMap, $absenceMap, $rttPaymentMap, $bonusMap, $mileageMap);
+
+        $options = new Options();
+        $options->set('isRemoteEnabled', true);
+
+        $dompdf = new Dompdf($options);
+        $html   = $this->twig->render('salary-recap/print.html.twig', [
+            'from'       => $from,
+            'to'         => $to,
+            'siteGroups' => $siteGroups,
+        ]);
+
+        $dompdf->loadHtml($html);
+        $dompdf->setPaper('A4', 'landscape');
+        $dompdf->render();
+
+        $filename = sprintf(
+            'recap_salaire_%s.pdf',
+            $from->format('Y-m')
+        );
+
+        return new Response($dompdf->output(), Response::HTTP_OK, [
+            'Content-Type'        => 'application/pdf',
+            'Content-Disposition' => 'inline; filename="'.$filename.'"',
+        ]);
+    }
+
+    /**
+     * @return list<string>
+     */
+    private function buildDays(DateTimeImmutable $from, DateTimeImmutable $to): array
+    {
+        $days    = [];
+        $current = $from;
+
+        while ($current <= $to) {
+            $days[]  = $current->format('Y-m-d');
+            $current = $current->add(new DateInterval('P1D'));
+        }
+
+        return $days;
+    }
+
+    /**
+     * @return array<int, array<string, WorkHour>>
+     */
+    private function buildWorkHourMap(array $workHours): array
+    {
+        $map = [];
+        foreach ($workHours as $wh) {
+            $employeeId = $wh->getEmployee()?->getId();
+            if (!$employeeId) {
+                continue;
+            }
+            $date                    = $wh->getWorkDate()->format('Y-m-d');
+            $map[$employeeId][$date] = $wh;
+        }
+
+        return $map;
+    }
+
+    /**
+     * @return array<int, list<Absence>>
+     */
+    private function buildAbsenceMap(array $absences): array
+    {
+        $map = [];
+        foreach ($absences as $absence) {
+            $employeeId = $absence->getEmployee()?->getId();
+            if (!$employeeId) {
+                continue;
+            }
+            $map[$employeeId][] = $absence;
+        }
+
+        return $map;
+    }
+
+    /**
+     * @return array<int, int>
+     */
+    private function buildRttPaymentMap(array $rttPayments): array
+    {
+        $map = [];
+        foreach ($rttPayments as $payment) {
+            $employeeId = $payment->getEmployee()?->getId();
+            if (!$employeeId) {
+                continue;
+            }
+            $map[$employeeId] = ($map[$employeeId] ?? 0) + $payment->getBase25Minutes() + $payment->getBase50Minutes();
+        }
+
+        return $map;
+    }
+
+    /**
+     * @return array<int, float>
+     */
+    private function buildBonusMap(array $bonuses): array
+    {
+        $map = [];
+        foreach ($bonuses as $bonus) {
+            $employeeId = $bonus->getEmployee()?->getId();
+            if (!$employeeId) {
+                continue;
+            }
+            $map[$employeeId] = ($map[$employeeId] ?? 0.0) + $bonus->getAmount();
+        }
+
+        return $map;
+    }
+
+    /**
+     * @return array<int, float>
+     */
+    private function buildMileageMap(array $mileages): array
+    {
+        $map = [];
+        foreach ($mileages as $mileage) {
+            $employeeId = $mileage->getEmployee()?->getId();
+            if (!$employeeId) {
+                continue;
+            }
+            $map[$employeeId] = ($map[$employeeId] ?? 0.0) + $mileage->getKilometers();
+        }
+
+        return $map;
+    }
+
+    private function aggregateBySite(
+        array $employees,
+        array $days,
+        array $contractMap,
+        array $driverMap,
+        array $workHourMap,
+        array $absenceMap,
+        array $rttPaymentMap,
+        array $bonusMap,
+        array $mileageMap,
+    ): array {
+        $siteGroups = [];
+
+        foreach ($employees as $employee) {
+            $employeeId = $employee->getId();
+            $site       = $employee->getSite();
+            $siteName   = $site ? $site->getName() : 'Sans site';
+            $siteId     = $site ? $site->getId() : 0;
+
+            $row = $this->buildEmployeeRow(
+                $employee,
+                $employeeId,
+                $days,
+                $contractMap[$employeeId] ?? [],
+                $driverMap[$employeeId] ?? [],
+                $workHourMap[$employeeId] ?? [],
+                $absenceMap[$employeeId] ?? [],
+                $rttPaymentMap[$employeeId] ?? 0,
+                $bonusMap[$employeeId] ?? 0.0,
+                $mileageMap[$employeeId] ?? 0.0,
+            );
+
+            if (!isset($siteGroups[$siteId])) {
+                $siteGroups[$siteId] = [
+                    'name'      => $siteName,
+                    'color'     => $site?->getColor() ?? '#ffd7d7',
+                    'employees' => [],
+                ];
+            }
+
+            $siteGroups[$siteId]['employees'][] = $row;
+        }
+
+        return $siteGroups;
+    }
+
+    private function buildEmployeeRow(
+        Employee $employee,
+        int $employeeId,
+        array $days,
+        array $contractsByDate,
+        array $driverByDate,
+        array $workHoursByDate,
+        array $absences,
+        int $rttPaidMinutes,
+        float $bonusAmount,
+        float $mileageKm,
+    ): array {
+        $contractName       = null;
+        $presenceDays       = 0.0;
+        $nightMinutesTotal  = 0;
+        $nightBasketCount   = 0;
+        $sundayMinutesTotal = 0;
+        $isDriverAnyDay     = false;
+        $driverBreakfast    = 0;
+        $driverMeals        = 0;
+        $driverOvernight    = 0;
+        $driverSaturdays    = 0;
+        $isForfait          = false;
+
+        foreach ($days as $date) {
+            $contract = $contractsByDate[$date] ?? null;
+            $isDriver = $driverByDate[$date] ?? false;
+            $wh       = $workHoursByDate[$date] ?? null;
+
+            if ($contract && null === $contractName) {
+                $contractName = $contract->getName();
+                $isForfait    = TrackingMode::PRESENCE === $contract->getTrackingModeEnum();
+            }
+
+            if ($isDriver) {
+                $isDriverAnyDay = true;
+            }
+
+            if (!$wh) {
+                continue;
+            }
+
+            $dayOfWeek = (int) new DateTimeImmutable($date)->format('N');
+
+            if ($isDriver) {
+                $nightMinutesTotal += $wh->getNightHoursMinutes() ?? 0;
+                $dayMin   = $wh->getDayHoursMinutes() ?? 0;
+                $nightMin = $wh->getNightHoursMinutes() ?? 0;
+                if (($nightMin > $dayMin && $nightMin > 0) || $nightMin >= 240) {
+                    ++$nightBasketCount;
+                }
+
+                if ($wh->getHasBreakfast()) {
+                    ++$driverBreakfast;
+                }
+                if ($wh->getHasLunch() || $wh->getHasDinner()) {
+                    ++$driverMeals;
+                }
+                if ($wh->getHasOvernight()) {
+                    ++$driverOvernight;
+                }
+
+                if (6 === $dayOfWeek && ($dayMin > 0 || $nightMin > 0 || ($wh->getWorkshopHoursMinutes() ?? 0) > 0)) {
+                    ++$driverSaturdays;
+                }
+
+                if (7 === $dayOfWeek) {
+                    $sundayMinutesTotal += $dayMin + $nightMin + ($wh->getWorkshopHoursMinutes() ?? 0);
+                }
+            } else {
+                $metrics = $this->computeNightMinutes($wh);
+                $nightMinutesTotal += $metrics['nightMinutes'];
+                if (($metrics['nightMinutes'] > $metrics['dayMinutes'] && $metrics['nightMinutes'] > 0) || $metrics['nightMinutes'] >= 240) {
+                    ++$nightBasketCount;
+                }
+
+                if (7 === $dayOfWeek) {
+                    $sundayMinutesTotal += $metrics['dayMinutes'] + $metrics['nightMinutes'];
+                }
+
+                // Samedi : les minutes après minuit débordent sur le dimanche
+                if (6 === $dayOfWeek) {
+                    $sundayMinutesTotal += $this->computeOverflowAfterMidnight($wh);
+                }
+
+                if ($isForfait) {
+                    if ($wh->getIsPresentMorning()) {
+                        $presenceDays += 0.5;
+                    }
+                    if ($wh->getIsPresentAfternoon()) {
+                        $presenceDays += 0.5;
+                    }
+                }
+            }
+        }
+
+        $conges  = $this->countAbsencesByCode($absences, ['C']);
+        $maladie = $this->countAbsencesByCode($absences, ['M', 'AT']);
+
+        $nightHours  = round($nightMinutesTotal / 60, 2);
+        $paidHours   = round($rttPaidMinutes / 60, 2);
+        $sundayHours = round($sundayMinutesTotal / 60, 2);
+
+        return [
+            'lastName'         => mb_strimwidth($employee->getLastName() ?? '', 0, 15, '...'),
+            'firstName'        => mb_strimwidth($employee->getFirstName() ?? '', 0, 15, '...'),
+            'contractName'     => $contractName,
+            'presenceDays'     => $presenceDays,
+            'mileageKm'        => $mileageKm,
+            'nightHours'       => $nightHours,
+            'nightBasketCount' => $nightBasketCount,
+            'paidHours'        => $paidHours,
+            'sundayHours'      => $sundayHours,
+            'bonusAmount'      => $bonusAmount,
+            'congesCount'      => $conges['count'],
+            'congesDates'      => $conges['dates'],
+            'maladieCount'     => $maladie['count'],
+            'maladieDates'     => $maladie['dates'],
+            'isDriver'         => $isDriverAnyDay,
+            'driverBreakfast'  => $driverBreakfast,
+            'driverMeals'      => $driverMeals,
+            'driverOvernight'  => $driverOvernight,
+            'driverSaturdays'  => $driverSaturdays,
+        ];
+    }
+
+    /**
+     * @return array{nightMinutes: int, dayMinutes: int}
+     */
+    private function computeNightMinutes(WorkHour $workHour): array
+    {
+        $ranges = [
+            [$workHour->getMorningFrom(), $workHour->getMorningTo()],
+            [$workHour->getAfternoonFrom(), $workHour->getAfternoonTo()],
+            [$workHour->getEveningFrom(), $workHour->getEveningTo()],
+        ];
+
+        $totalMinutes = 0;
+        $nightMinutes = 0;
+
+        foreach ($ranges as [$from, $to]) {
+            $totalMinutes += $this->intervalMinutes($from, $to);
+            $nightMinutes += $this->nightIntervalMinutes($from, $to);
+        }
+
+        $dayMinutes = max(0, $totalMinutes - $nightMinutes);
+
+        return [
+            'nightMinutes' => $nightMinutes,
+            'dayMinutes'   => $dayMinutes,
+        ];
+    }
+
+    /**
+     * @return null|array{int, int}
+     */
+    private function resolveInterval(?string $from, ?string $to): ?array
+    {
+        $fromMinutes = $this->toMinutes($from);
+        $toMinutes   = $this->toMinutes($to);
+        if (null === $fromMinutes || null === $toMinutes) {
+            return null;
+        }
+
+        $end = $toMinutes <= $fromMinutes ? $toMinutes + 1440 : $toMinutes;
+
+        return [$fromMinutes, $end];
+    }
+
+    private function toMinutes(?string $time): ?int
+    {
+        if (null === $time || '' === $time) {
+            return null;
+        }
+
+        [$hours, $minutes] = array_map('intval', explode(':', $time));
+
+        return ($hours * 60) + $minutes;
+    }
+
+    private function intervalMinutes(?string $from, ?string $to): int
+    {
+        $interval = $this->resolveInterval($from, $to);
+        if (null === $interval) {
+            return 0;
+        }
+
+        [$start, $end] = $interval;
+
+        return max(0, $end - $start);
+    }
+
+    private function nightIntervalMinutes(?string $from, ?string $to): int
+    {
+        $interval = $this->resolveInterval($from, $to);
+        if (null === $interval) {
+            return 0;
+        }
+
+        [$start, $end] = $interval;
+        $windows       = [[0, 360], [1260, 1440]];
+        $total         = 0;
+
+        for ($dayOffset = 0; $dayOffset <= 1; ++$dayOffset) {
+            $shift = $dayOffset * 1440;
+            foreach ($windows as [$windowStart, $windowEnd]) {
+                $total += $this->overlap($start, $end, $windowStart + $shift, $windowEnd + $shift);
+            }
+        }
+
+        return $total;
+    }
+
+    /**
+     * Calcule les minutes qui débordent après minuit (> 1440) pour les créneaux d'un WorkHour.
+     * Ex: créneau soir 21:00-05:00 → interval [1260, 1740] → overflow = 1740-1440 = 300 min (5h).
+     */
+    private function computeOverflowAfterMidnight(WorkHour $workHour): int
+    {
+        $ranges = [
+            [$workHour->getMorningFrom(), $workHour->getMorningTo()],
+            [$workHour->getAfternoonFrom(), $workHour->getAfternoonTo()],
+            [$workHour->getEveningFrom(), $workHour->getEveningTo()],
+        ];
+
+        $overflow = 0;
+
+        foreach ($ranges as [$from, $to]) {
+            $interval = $this->resolveInterval($from, $to);
+            if (null === $interval) {
+                continue;
+            }
+
+            [$start, $end] = $interval;
+
+            // Si le créneau dépasse minuit (1440), la partie au-delà est sur le jour suivant
+            if ($end > 1440) {
+                $overflow += $end - max($start, 1440);
+            }
+        }
+
+        return $overflow;
+    }
+
+    private function overlap(int $startA, int $endA, int $startB, int $endB): int
+    {
+        $start = max($startA, $startB);
+        $end   = min($endA, $endB);
+
+        return max(0, $end - $start);
+    }
+
+    /**
+     * @param list<Absence> $absences
+     * @param list<string>  $codes
+     *
+     * @return array{count: float, dates: string}
+     */
+    private function countAbsencesByCode(array $absences, array $codes): array
+    {
+        $count   = 0.0;
+        $dayKeys = [];
+
+        foreach ($absences as $absence) {
+            $type = $absence->getType();
+            if (!$type || !in_array($type->getCode(), $codes, true)) {
+                continue;
+            }
+
+            $startHalf = $absence->getStartHalf();
+            $endHalf   = $absence->getEndHalf();
+
+            if ($startHalf === $endHalf) {
+                $count += 0.5;
+            } else {
+                $count += 1.0;
+            }
+
+            $dayKeys[] = $absence->getStartDate()->format('Y-m-d');
+        }
+
+        sort($dayKeys);
+        $dayKeys = array_unique($dayKeys);
+
+        $periods = $this->mergeDaysIntoPeriods($dayKeys);
+
+        return [
+            'count' => $count,
+            'dates' => implode(', ', $periods),
+        ];
+    }
+
+    /**
+     * @param list<string> $sortedDates Y-m-d sorted
+     *
+     * @return list<string>
+     */
+    private function mergeDaysIntoPeriods(array $sortedDates): array
+    {
+        if ([] === $sortedDates) {
+            return [];
+        }
+
+        $periods    = [];
+        $rangeStart = $sortedDates[0];
+        $rangeEnd   = $sortedDates[0];
+
+        for ($i = 1, $len = count($sortedDates); $i < $len; ++$i) {
+            $prev    = new DateTimeImmutable($rangeEnd);
+            $current = new DateTimeImmutable($sortedDates[$i]);
+
+            if (1 === $current->diff($prev)->days) {
+                $rangeEnd = $sortedDates[$i];
+            } else {
+                $periods[]  = $this->formatPeriod($rangeStart, $rangeEnd);
+                $rangeStart = $sortedDates[$i];
+                $rangeEnd   = $sortedDates[$i];
+            }
+        }
+
+        $periods[] = $this->formatPeriod($rangeStart, $rangeEnd);
+
+        return $periods;
+    }
+
+    private function formatPeriod(string $start, string $end): string
+    {
+        $s = new DateTimeImmutable($start)->format('d/m');
+
+        if ($start === $end) {
+            return $s;
+        }
+
+        return 'Du '.$s.' au '.new DateTimeImmutable($end)->format('d/m');
+    }
+}
--- a/src/State/WorkHourBulkUpsertProcessor.php
+++ b/src/State/WorkHourBulkUpsertProcessor.php
@@ -229,8 +229,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
     *     isPresentAfternoon:bool,
     *     dayHoursMinutes:?int,
     *     nightHoursMinutes:?int,
+     *     workshopHoursMinutes:?int,
     *     hasBreakfast:bool,
     *     hasLunch:bool,
+     *     hasDinner:bool,
     *     hasOvernight:bool
     * }
     */
@@ -238,37 +240,41 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
    {
        if ($isDriver) {
            return [
-                'morningFrom'        => null,
-                'morningTo'          => null,
-                'afternoonFrom'      => null,
-                'afternoonTo'        => null,
-                'eveningFrom'        => null,
-                'eveningTo'          => null,
-                'isPresentMorning'   => false,
-                'isPresentAfternoon' => false,
-                'dayHoursMinutes'    => $this->normalizeMinutes($entry['dayHoursMinutes'] ?? null, $employeeId, 'dayHoursMinutes'),
-                'nightHoursMinutes'  => $this->normalizeMinutes($entry['nightHoursMinutes'] ?? null, $employeeId, 'nightHoursMinutes'),
-                'hasBreakfast'       => $this->normalizePresence($entry['hasBreakfast'] ?? false, $employeeId, 'hasBreakfast'),
-                'hasLunch'           => $this->normalizePresence($entry['hasLunch'] ?? false, $employeeId, 'hasLunch'),
-                'hasOvernight'       => $this->normalizePresence($entry['hasOvernight'] ?? false, $employeeId, 'hasOvernight'),
+                'morningFrom'          => null,
+                'morningTo'            => null,
+                'afternoonFrom'        => null,
+                'afternoonTo'          => null,
+                'eveningFrom'          => null,
+                'eveningTo'            => null,
+                'isPresentMorning'     => false,
+                'isPresentAfternoon'   => false,
+                'dayHoursMinutes'      => $this->normalizeMinutes($entry['dayHoursMinutes'] ?? null, $employeeId, 'dayHoursMinutes'),
+                'nightHoursMinutes'    => $this->normalizeMinutes($entry['nightHoursMinutes'] ?? null, $employeeId, 'nightHoursMinutes'),
+                'workshopHoursMinutes' => $this->normalizeMinutes($entry['workshopHoursMinutes'] ?? null, $employeeId, 'workshopHoursMinutes'),
+                'hasBreakfast'         => $this->normalizePresence($entry['hasBreakfast'] ?? false, $employeeId, 'hasBreakfast'),
+                'hasLunch'             => $this->normalizePresence($entry['hasLunch'] ?? false, $employeeId, 'hasLunch'),
+                'hasDinner'            => $this->normalizePresence($entry['hasDinner'] ?? false, $employeeId, 'hasDinner'),
+                'hasOvernight'         => $this->normalizePresence($entry['hasOvernight'] ?? false, $employeeId, 'hasOvernight'),
            ];
        }

        if ($isPresenceTracking) {
            return [
-                'morningFrom'        => null,
-                'morningTo'          => null,
-                'afternoonFrom'      => null,
-                'afternoonTo'        => null,
-                'eveningFrom'        => null,
-                'eveningTo'          => null,
-                'isPresentMorning'   => $this->normalizePresence($entry['isPresentMorning'] ?? false, $employeeId, 'isPresentMorning'),
-                'isPresentAfternoon' => $this->normalizePresence($entry['isPresentAfternoon'] ?? false, $employeeId, 'isPresentAfternoon'),
-                'dayHoursMinutes'    => null,
-                'nightHoursMinutes'  => null,
-                'hasBreakfast'       => false,
-                'hasLunch'           => false,
-                'hasOvernight'       => false,
+                'morningFrom'          => null,
+                'morningTo'            => null,
+                'afternoonFrom'        => null,
+                'afternoonTo'          => null,
+                'eveningFrom'          => null,
+                'eveningTo'            => null,
+                'isPresentMorning'     => $this->normalizePresence($entry['isPresentMorning'] ?? false, $employeeId, 'isPresentMorning'),
+                'isPresentAfternoon'   => $this->normalizePresence($entry['isPresentAfternoon'] ?? false, $employeeId, 'isPresentAfternoon'),
+                'dayHoursMinutes'      => null,
+                'nightHoursMinutes'    => null,
+                'workshopHoursMinutes' => null,
+                'hasBreakfast'         => false,
+                'hasLunch'             => false,
+                'hasDinner'            => false,
+                'hasOvernight'         => false,
            ];
        }

@@ -281,13 +287,15 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
            'eveningTo'     => $this->normalizeTime($entry['eveningTo'] ?? null, $employeeId, 'eveningTo'),
            // On conserve aussi la présence si envoyée (cas forfait affiché côté UI),
            // même si le contrat résolu ce jour est en suivi horaire.
-            'isPresentMorning'   => $this->normalizePresence($entry['isPresentMorning'] ?? false, $employeeId, 'isPresentMorning'),
-            'isPresentAfternoon' => $this->normalizePresence($entry['isPresentAfternoon'] ?? false, $employeeId, 'isPresentAfternoon'),
-            'dayHoursMinutes'    => null,
-            'nightHoursMinutes'  => null,
-            'hasBreakfast'       => false,
-            'hasLunch'           => false,
-            'hasOvernight'       => false,
+            'isPresentMorning'     => $this->normalizePresence($entry['isPresentMorning'] ?? false, $employeeId, 'isPresentMorning'),
+            'isPresentAfternoon'   => $this->normalizePresence($entry['isPresentAfternoon'] ?? false, $employeeId, 'isPresentAfternoon'),
+            'dayHoursMinutes'      => null,
+            'nightHoursMinutes'    => null,
+            'workshopHoursMinutes' => null,
+            'hasBreakfast'         => false,
+            'hasLunch'             => false,
+            'hasDinner'            => false,
+            'hasOvernight'         => false,
        ];
    }

@@ -368,8 +376,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
     *     isPresentAfternoon:bool,
     *     dayHoursMinutes:?int,
     *     nightHoursMinutes:?int,
+     *     workshopHoursMinutes:?int,
     *     hasBreakfast:bool,
     *     hasLunch:bool,
+     *     hasDinner:bool,
     *     hasOvernight:bool
     * } $entry
     */
@@ -385,8 +395,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
            && false === $entry['isPresentAfternoon']
            && (null === $entry['dayHoursMinutes'] || 0 === $entry['dayHoursMinutes'])
            && (null === $entry['nightHoursMinutes'] || 0 === $entry['nightHoursMinutes'])
+            && (null === $entry['workshopHoursMinutes'] || 0 === $entry['workshopHoursMinutes'])
            && false === $entry['hasBreakfast']
            && false === $entry['hasLunch']
+            && false === $entry['hasDinner']
            && false === $entry['hasOvernight'];
    }

@@ -402,8 +414,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
     *     isPresentAfternoon:bool,
     *     dayHoursMinutes:?int,
     *     nightHoursMinutes:?int,
+     *     workshopHoursMinutes:?int,
     *     hasBreakfast:bool,
     *     hasLunch:bool,
+     *     hasDinner:bool,
     *     hasOvernight:bool
     * } $entry
     */
@@ -420,8 +434,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
            ->setIsPresentAfternoon($entry['isPresentAfternoon'])
            ->setDayHoursMinutes($entry['dayHoursMinutes'])
            ->setNightHoursMinutes($entry['nightHoursMinutes'])
+            ->setWorkshopHoursMinutes($entry['workshopHoursMinutes'])
            ->setHasBreakfast($entry['hasBreakfast'])
            ->setHasLunch($entry['hasLunch'])
+            ->setHasDinner($entry['hasDinner'])
            ->setHasOvernight($entry['hasOvernight'])
            // Toute modification invalide la validation chef de site.
            ->setIsSiteValid(false)
@@ -442,8 +458,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
     *     isPresentAfternoon:bool,
     *     dayHoursMinutes:?int,
     *     nightHoursMinutes:?int,
+     *     workshopHoursMinutes:?int,
     *     hasBreakfast:bool,
     *     hasLunch:bool,
+     *     hasDinner:bool,
     *     hasOvernight:bool
     * } $entry
     */
@@ -459,8 +477,10 @@ final readonly class WorkHourBulkUpsertProcessor implements ProcessorInterface
            && $workHour->getIsPresentAfternoon() === $entry['isPresentAfternoon']
            && $workHour->getDayHoursMinutes() === $entry['dayHoursMinutes']
            && $workHour->getNightHoursMinutes() === $entry['nightHoursMinutes']
+            && $workHour->getWorkshopHoursMinutes() === $entry['workshopHoursMinutes']
            && $workHour->getHasBreakfast() === $entry['hasBreakfast']
            && $workHour->getHasLunch() === $entry['hasLunch']
+            && $workHour->getHasDinner() === $entry['hasDinner']
            && $workHour->getHasOvernight() === $entry['hasOvernight'];
    }
 }
--- a/src/State/WorkHourWeeklySummaryProvider.php
+++ b/src/State/WorkHourWeeklySummaryProvider.php
@@ -127,14 +127,16 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
            // Pré-calcul des métriques par salarié/date pour simplifier l'agrégation finale.
            $dateKey                                      = $workHour->getWorkDate()->format('Y-m-d');
            $metricsByEmployeeDate[$employeeId][$dateKey] = [
-                'metrics'            => $this->computeMetrics($workHour),
-                'isPresentMorning'   => $workHour->getIsPresentMorning(),
-                'isPresentAfternoon' => $workHour->getIsPresentAfternoon(),
-                'dayHoursMinutes'    => $workHour->getDayHoursMinutes(),
-                'nightHoursMinutes'  => $workHour->getNightHoursMinutes(),
-                'hasBreakfast'       => $workHour->getHasBreakfast(),
-                'hasLunch'           => $workHour->getHasLunch(),
-                'hasOvernight'       => $workHour->getHasOvernight(),
+                'metrics'              => $this->computeMetrics($workHour),
+                'isPresentMorning'     => $workHour->getIsPresentMorning(),
+                'isPresentAfternoon'   => $workHour->getIsPresentAfternoon(),
+                'dayHoursMinutes'      => $workHour->getDayHoursMinutes(),
+                'nightHoursMinutes'    => $workHour->getNightHoursMinutes(),
+                'workshopHoursMinutes' => $workHour->getWorkshopHoursMinutes(),
+                'hasBreakfast'         => $workHour->getHasBreakfast(),
+                'hasLunch'             => $workHour->getHasLunch(),
+                'hasDinner'            => $workHour->getHasDinner(),
+                'hasOvernight'         => $workHour->getHasOvernight(),
            ];
        }

@@ -185,14 +187,17 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                continue;
            }

-            $weeklyDayMinutes     = 0;
-            $weeklyNightMinutes   = 0;
-            $weeklyTotalMinutes   = 0;
-            $weeklyPresenceCount  = 0.0;
-            $weeklyBreakfastCount = 0;
-            $weeklyLunchCount     = 0;
-            $weeklyOvernightCount = 0;
-            $daily                = [];
+            $weeklyDayMinutes       = 0;
+            $weeklyNightMinutes     = 0;
+            $weeklyWorkshopMinutes  = 0;
+            $weeklyTotalMinutes     = 0;
+            $weeklyPresenceCount    = 0.0;
+            $weeklyNightBasketCount = 0;
+            $weeklyBreakfastCount   = 0;
+            $weeklyLunchCount       = 0;
+            $weeklyDinnerCount      = 0;
+            $weeklyOvernightCount   = 0;
+            $daily                  = [];
            // Les contrats au suivi "présence" ne manipulent pas les heures, mais des demi-journées.
            $weekAnchorContract = $contractsByEmployeeDate[$employeeId][$anchorDateYmd]
                ?? $contractsByEmployeeDate[$employeeId][$days[0]]
@@ -204,8 +209,12 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                ?? $contractNaturesByEmployeeDate[$employeeId][$days[0]]
                ?? ContractNature::CDI;
            $employeeContractsByDate = [];
+            $hasContractForWeek      = false;
            foreach ($days as $date) {
                $employeeContractsByDate[$date] = $contractsByEmployeeDate[$employeeId][$date] ?? null;
+                if (null !== $employeeContractsByDate[$date]) {
+                    $hasContractForWeek = true;
+                }
            }

            foreach ($days as $date) {
@@ -217,14 +226,18 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface

                $hasBreakfast = false;
                $hasLunch     = false;
+                $hasDinner    = false;
                $hasOvernight = false;

                if ($isDateDriver) {
-                    $dayMinutes   = ($entry['dayHoursMinutes'] ?? 0);
-                    $nightMinutes = ($entry['nightHoursMinutes'] ?? 0);
-                    $totalMinutes = $dayMinutes + $nightMinutes;
+                    $dayMinutes      = ($entry['dayHoursMinutes'] ?? 0);
+                    $nightMinutes    = ($entry['nightHoursMinutes'] ?? 0);
+                    $workshopMinutes = ($entry['workshopHoursMinutes'] ?? 0);
+                    $totalMinutes    = $dayMinutes + $nightMinutes + $workshopMinutes + $creditedMinutes;
+                    $dayMinutes += $creditedMinutes;
                    $hasBreakfast = $entry['hasBreakfast'] ?? false;
                    $hasLunch     = $entry['hasLunch'] ?? false;
+                    $hasDinner    = $entry['hasDinner'] ?? false;
                    $hasOvernight = $entry['hasOvernight'] ?? false;
                    if ($hasBreakfast) {
                        ++$weeklyBreakfastCount;
@@ -232,6 +245,9 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                    if ($hasLunch) {
                        ++$weeklyLunchCount;
                    }
+                    if ($hasDinner) {
+                        ++$weeklyDinnerCount;
+                    }
                    if ($hasOvernight) {
                        ++$weeklyOvernightCount;
                    }
@@ -239,9 +255,10 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                    $metrics = $entry['metrics'] ?? new WorkMetrics();
                    // Les absences "comptées comme travaillées" alimentent le total du jour.
                    $metrics->addCreditedMinutes($creditedMinutes);
-                    $dayMinutes   = $metrics->dayMinutes;
-                    $nightMinutes = $metrics->nightMinutes;
-                    $totalMinutes = $metrics->totalMinutes;
+                    $dayMinutes      = $metrics->dayMinutes;
+                    $nightMinutes    = $metrics->nightMinutes;
+                    $workshopMinutes = 0;
+                    $totalMinutes    = $metrics->totalMinutes;
                }

                $present = null;
@@ -254,8 +271,14 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                    $present          = min(1.0, $morning + $afternoon + $creditedPresence);
                }

+                $hasNightBasket = ($nightMinutes > $dayMinutes && $nightMinutes > 0) || $nightMinutes >= 240;
+                if ($hasNightBasket) {
+                    ++$weeklyNightBasketCount;
+                }
+
                $weeklyDayMinutes += $dayMinutes;
                $weeklyNightMinutes += $nightMinutes;
+                $weeklyWorkshopMinutes += $workshopMinutes;
                $weeklyTotalMinutes += $totalMinutes;
                if (null !== $present) {
                    $weeklyPresenceCount += $present;
@@ -265,13 +288,16 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                    date: $date,
                    dayMinutes: $dayMinutes,
                    nightMinutes: $nightMinutes,
+                    workshopMinutes: $workshopMinutes,
                    totalMinutes: $totalMinutes,
                    present: $present,
                    hasAbsence: $absenceByEmployeeDate[$employeeId][$date] ?? false,
                    absenceLabel: $absenceLabelByEmployeeDate[$employeeId][$date] ?? null,
                    absenceColor: $absenceColorByEmployeeDate[$employeeId][$date] ?? null,
+                    hasNightBasket: $hasNightBasket,
                    hasBreakfast: $hasBreakfast,
                    hasLunch: $hasLunch,
+                    hasDinner: $hasDinner,
                    hasOvernight: $hasOvernight,
                );
            }
@@ -304,16 +330,20 @@ final readonly class WorkHourWeeklySummaryProvider implements ProviderInterface
                daily: $daily,
                weeklyDayMinutes: $weeklyDayMinutes,
                weeklyNightMinutes: $weeklyNightMinutes,
+                weeklyWorkshopMinutes: $weeklyWorkshopMinutes,
                weeklyTotalMinutes: $weeklyTotalMinutes,
                weeklyPresenceCount: $weeklyPresenceCount,
                weeklyOvertimeTotalMinutes: $weeklyOvertimeTotalMinutes,
                weeklyOvertime25Minutes: $weeklyOvertime25Minutes,
                weeklyOvertime50Minutes: $weeklyOvertime50Minutes,
                weeklyRecoveryMinutes: $weeklyRecoveryMinutes,
+                weeklyNightBasketCount: $weeklyNightBasketCount,
                isDriver: $isDriver,
                weeklyBreakfastCount: $weeklyBreakfastCount,
                weeklyLunchCount: $weeklyLunchCount,
+                weeklyDinnerCount: $weeklyDinnerCount,
                weeklyOvernightCount: $weeklyOvernightCount,
+                hasContractForWeek: $hasContractForWeek,
            );
        }

--- a/templates/leave-recap/print.html.twig
+++ b/templates/leave-recap/print.html.twig
@@ -0,0 +1,124 @@
+<!doctype html>
+<html lang="fr">
+<head>
+    <meta charset="utf-8">
+    <title>Récapitulatif Congés & RTT</title>
+
+    <style>
+        @page { size: A4 portrait; margin: 4mm; }
+
+        html, body {
+            margin: 0;
+            padding: 2mm;
+            font-family: Helvetica, sans-serif;
+            font-size: 10px;
+        }
+
+        .title-bar {
+            position: relative;
+            margin: 0 0 6mm 0;
+        }
+
+        h1 {
+            text-align: center;
+            font-size: 18px;
+            margin: 0;
+        }
+
+        .date-box {
+            position: absolute;
+            top: 0;
+            right: 0;
+            border: 2px solid #000;
+            padding: 4px 12px;
+            font-size: 14px;
+            font-weight: 700;
+        }
+
+        table.recap {
+            width: 100%;
+            border-collapse: collapse;
+            table-layout: auto;
+            border: 4px solid #0a0a0a;
+        }
+
+        th, td {
+            border: 2px solid #0a0a0a;
+            padding: 3px 5px;
+            vertical-align: middle;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+
+        .site-header td {
+            font-weight: 700;
+            font-size: 12px;
+            text-align: center;
+        }
+
+        thead th {
+            text-align: center;
+            font-weight: 700;
+            font-size: 10px;
+            white-space: normal;
+        }
+
+        td.name {
+            text-align: left;
+            font-weight: bold;
+        }
+        td.base { text-align: center; }
+        td.num  { text-align: center; }
+        td.obs  { min-width: 40mm; }
+
+        tbody td { font-size: 10px; }
+    </style>
+</head>
+<body>
+
+<div class="title-bar">
+    <h1>RECAPITULATIF CONGES & RTT</h1>
+    <div class="date-box">{{ today|date('d/m/Y') }}</div>
+</div>
+
+<table class="recap">
+    <thead>
+        <tr>
+            <th style="text-align: left;">Nom</th>
+            <th>Contrat</th>
+            <th>CP N-1<br>restant</th>
+            <th>Samedi<br>restant</th>
+            <th>CP<br>N</th>
+            <th>RTT</th>
+            <th style="width: 40mm;">Observations</th>
+        </tr>
+    </thead>
+    <tbody>
+    {% for siteId, group in siteGroups %}
+        {% set siteColor = group.color ?? '#B3E5FC' %}
+        <tr class="site-header">
+            <td style="background: {{ siteColor }}; text-align: left;" colspan="7">
+                {{ group.name }}
+            </td>
+        </tr>
+        {% for row in group.employees %}
+            <tr>
+                <td class="name">{{ row.lastName }} {{ row.firstName }}</td>
+                <td class="base">{{ row.contractName ?? '' }}</td>
+                <td class="num">{{ row.cpN1Remaining }}</td>
+                <td class="num">{{ row.acquiredSaturdays }}</td>
+                <td class="num">{{ row.cpN }}</td>
+                <td class="num">{{ row.rtt }}</td>
+                <td class="obs"></td>
+            </tr>
+        {% else %}
+            <tr>
+                <td colspan="7">Aucun employé.</td>
+            </tr>
+        {% endfor %}
+    {% endfor %}
+    </tbody>
+</table>
+
+</body>
+</html>
--- a/templates/salary-recap/print.html.twig
+++ b/templates/salary-recap/print.html.twig
@@ -0,0 +1,163 @@
+<!doctype html>
+<html lang="fr">
+<head>
+    <meta charset="utf-8">
+    <title>Récapitulatif Salaire</title>
+
+    <style>
+        @page { size: A4 landscape; margin: 4mm; }
+
+        html, body {
+            margin: 0;
+            padding: 2mm;
+            font-family: Helvetica, sans-serif;
+            font-size: 10px;
+        }
+
+        .title-bar {
+            position: relative;
+            margin: 0 0 6mm 0;
+        }
+
+        h1 {
+            text-align: center;
+            font-size: 18px;
+            margin: 0;
+        }
+
+        .month-box {
+            position: absolute;
+            top: 0;
+            right: 0;
+            border: 2px solid #000;
+            padding: 4px 12px;
+            font-size: 14px;
+            font-weight: 700;
+            text-transform: uppercase;
+        }
+
+        table.recap {
+            width: 100%;
+            border-collapse: collapse;
+            table-layout: auto;
+            border: 4px solid #0a0a0a;
+        }
+
+        th, td {
+            border: 2px solid #0a0a0a;
+            padding: 3px 3px;
+            vertical-align: middle;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+
+        .site-header td {
+            font-weight: 700;
+            font-size: 12px;
+            text-align: center;
+        }
+
+        thead th {
+            text-align: center;
+            font-weight: 700;
+            font-size: 10px;
+            white-space: normal;
+        }
+
+        td.name {
+            text-align: left;
+            font-weight: bold;
+        }
+        td.base { text-align: center; }
+        td.num  { text-align: center; }
+        td.dates {
+            text-align: left;
+            white-space: normal;
+            word-break: break-word;
+            font-size: 10px;
+        }
+        td.obs  { }
+
+        tbody td { font-size: 10px; }
+    </style>
+</head>
+<body>
+
+{% set months = {
+    1:'Janvier', 2:'Février', 3:'Mars', 4:'Avril', 5:'Mai', 6:'Juin',
+    7:'Juillet', 8:'Août', 9:'Septembre', 10:'Octobre', 11:'Novembre', 12:'Décembre'
+} %}
+
+<div class="title-bar">
+    <h1>RECAPITULATIF SALAIRE DU {{ from|date('d/m/Y') }} au {{ to|date('d/m/Y') }}</h1>
+    <div class="month-box">{{ months[from|date('n')|number_format] }} {{ from|date('Y') }}</div>
+</div>
+
+<table class="recap">
+    <thead>
+        <tr>
+            <th rowspan="2" style="width: 24mm; text-align: left;">Nom</th>
+            <th rowspan="2" style="width: 12mm;">Base</th>
+            <th rowspan="2" style="width: 12mm;">Jour de<br>présence<br>Cadre</th>
+            <th rowspan="2" style="width: 9mm;">Frais<br>Kms</th>
+            <th rowspan="2" style="width: 9mm;">Heures<br>de<br>nuit</th>
+            <th rowspan="2" style="width: 9mm;">Panier<br>de<br>nuit</th>
+            <th rowspan="2" style="width: 12mm;">Heures<br>payés</th>
+            <th rowspan="2" style="width: 9mm;">Heures<br>dim.</th>
+            <th rowspan="2" style="width: 9mm;">Prime</th>
+            <th colspan="2">Congés</th>
+            <th colspan="2">Maladie</th>
+            <th colspan="4">CHAUFFEUR</th>
+            <th rowspan="2" style="width: 26mm;">Observations</th>
+        </tr>
+        <tr>
+            <th style="width: 10mm;">Nbre</th>
+            <th style="width: 26mm;">Date</th>
+            <th style="width: 10mm;">Nbre</th>
+            <th style="width: 26mm;">Date</th>
+            <th style="width: 8mm;">PDJ</th>
+            <th style="width: 10mm;">REPAS</th>
+            <th style="width: 12mm;">NUITEE</th>
+            <th style="width: 12mm;">samedi</th>
+        </tr>
+    </thead>
+    <tbody>
+    {% for siteId, group in siteGroups %}
+        {% set siteColor = group.color ?? '#B3E5FC' %}
+        <tr class="site-header">
+            <td style="background: {{ siteColor }}; text-align: left;" colspan="18">
+                {{ group.name }}
+            </td>
+        </tr>
+        {% for row in group.employees %}
+            <tr>
+                <td class="name">{{ row.lastName }}<br>{{ row.firstName }}</td>
+                <td class="base">{{ row.contractName ?? '' }}</td>
+                <td class="num">{{ row.presenceDays > 0 ? row.presenceDays : '' }}</td>
+                <td class="num">{{ row.mileageKm > 0 ? row.mileageKm : '' }}</td>
+                <td class="num">{{ row.nightHours > 0 ? row.nightHours : '' }}</td>
+                <td class="num">{{ row.nightBasketCount > 0 ? row.nightBasketCount : '' }}</td>
+                <td class="num">{{ row.paidHours > 0 ? row.paidHours : '' }}</td>
+                <td class="num">{{ row.sundayHours > 0 ? row.sundayHours : '' }}</td>
+                <td class="num">{{ row.bonusAmount > 0 ? row.bonusAmount : '' }}</td>
+                <td class="num">{{ row.congesCount > 0 ? row.congesCount : '' }}</td>
+                <td class="dates">{{ row.congesDates }}</td>
+                <td class="num">{{ row.maladieCount > 0 ? row.maladieCount : '' }}</td>
+                <td class="dates">{{ row.maladieDates }}</td>
+                <td class="num">{{ row.isDriver and row.driverBreakfast > 0 ? row.driverBreakfast : '' }}</td>
+                <td class="num">{{ row.isDriver and row.driverMeals > 0 ? row.driverMeals : '' }}</td>
+                <td class="num">{{ row.isDriver and row.driverOvernight > 0 ? row.driverOvernight : '' }}</td>
+                <td class="num">{{ row.isDriver and row.driverSaturdays > 0 ? row.driverSaturdays : '' }}</td>
+                <td class="obs"></td>
+            </tr>
+        {% else %}
+            <tr>
+                <td colspan="18">Aucun employé.</td>
+            </tr>
+        {% endfor %}
+    {% endfor %}
+    </tbody>
+</table>
+
+</body>
+</html>
Author	SHA1	Message	Date
gitea-actions	834b4cb695	chore: bump version to v0.1.56 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m36s Details	2026-03-19 16:10:25 +00:00
tristan	17f871e82d	feat : modification écran RTT + modification écran frais All checks were successful Auto Tag Develop / tag (push) Successful in 8s Details	2026-03-19 17:10:11 +01:00
gitea-actions	3ec1e1f10d	chore: bump version to v0.1.55 All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details Build Release Artefact / build (push) Successful in 1m22s Details	2026-03-18 14:40:57 +00:00
tristan	24b7512c8a	Merge remote-tracking branch 'origin/develop' into develop Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-03-18 15:40:44 +01:00
tristan	f047e3ed4b	feat : ajout d'une colonne montant dans les Frais employé	2026-03-18 15:40:31 +01:00
gitea-actions	1feedd0381	chore: bump version to v0.1.54 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m9s Details	2026-03-17 14:24:43 +00:00
tristan	f9cd5a0143	fix : RTT à la date du jour et affichage des congés restant All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details	2026-03-17 15:24:32 +01:00
gitea-actions	ede7decaa7	chore: bump version to v0.1.53 All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details Build Release Artefact / build (push) Successful in 1m44s Details	2026-03-17 14:05:55 +00:00
tristan	2cfb05e5de	feat : ajout de cache sur la récupération des jours fériés Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-03-17 15:05:43 +01:00
gitea-actions	0a8399a950	chore: bump version to v0.1.52 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m15s Details	2026-03-17 12:52:06 +00:00
tristan	6a64cb4c58	feat : ajout de sécurité sur les endpoints Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-03-17 13:52:00 +01:00
gitea-actions	facded4c55	chore: bump version to v0.1.51 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m10s Details	2026-03-17 12:28:00 +00:00
tristan	9787231052	fix : correction calcule prorata congés avec un arrêt maladie long Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-03-17 13:27:51 +01:00
gitea-actions	8563ddb08c	chore: bump version to v0.1.50 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m12s Details	2026-03-17 10:54:32 +00:00
tristan	353d4d9d2b	fix : correction calcule prorata congés avec une suspension de contrat Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-03-17 11:54:23 +01:00
gitea-actions	8745e5e425	chore: bump version to v0.1.49 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m14s Details	2026-03-17 10:25:15 +00:00
tristan	4d8c850a77	Merge remote-tracking branch 'origin/develop' into develop Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-03-17 11:25:05 +01:00
tristan	1974ace1f2	fix : correction validation des heures qui bloque la modification	2026-03-17 11:24:56 +01:00
gitea-actions	a99a12a759	chore: bump version to v0.1.48 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m15s Details	2026-03-17 10:17:34 +00:00
tristan	548b5d63a6	fix : correction calcule des RTT All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details	2026-03-17 11:17:24 +01:00
gitea-actions	ed9df4e178	chore: bump version to v0.1.47 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m20s Details	2026-03-17 09:34:55 +00:00
tristan	625b4af5ba	fix : correction calcule des paniers de nuit Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-03-17 10:34:45 +01:00
gitea-actions	2ec3044cb3	chore: bump version to v0.1.46 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m20s Details	2026-03-17 08:09:03 +00:00
tristan	f024a6a8de	fix : correction du calcule des RTT All checks were successful Auto Tag Develop / tag (push) Successful in 6s Details	2026-03-17 09:08:54 +01:00
gitea-actions	a60294a8f7	chore: bump version to v0.1.45 All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details Build Release Artefact / build (push) Successful in 1m21s Details	2026-03-16 17:23:19 +00:00
tristan	dd7f9ef8a0	Merge remote-tracking branch 'origin/develop' into develop Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-03-16 18:23:05 +01:00
tristan	cfa7d25521	fix : correction du récap congés et RTT	2026-03-16 18:22:55 +01:00
gitea-actions	5faa0facca	chore: bump version to v0.1.44 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m48s Details	2026-03-16 17:18:08 +00:00
tristan	04f90afc58	feat : ajout de la règle de décompte des RTT et correction du récap congés et RTT Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-03-16 18:17:58 +01:00
gitea-actions	e022cfac98	chore: bump version to v0.1.43 All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details Build Release Artefact / build (push) Successful in 1m14s Details	2026-03-16 15:26:24 +00:00
tristan	e827128392	Merge remote-tracking branch 'origin/develop' into develop All checks were successful Auto Tag Develop / tag (push) Successful in 6s Details	2026-03-16 16:26:13 +01:00
tristan	86cdec50c6	feat : ajout de l'export récap congés et RTT	2026-03-16 16:26:06 +01:00
gitea-actions	443ed1e003	chore: bump version to v0.1.42 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m21s Details	2026-03-16 13:38:06 +00:00
tristan	cef364fcec	fix : fix affichage employé sur les pages d'heures + ajout d'un filtre employé sur la liste + fix impression recap salaire Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-03-16 14:37:00 +01:00
gitea-actions	d4884bc489	chore: bump version to v0.1.41 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m12s Details	2026-03-16 11:25:51 +00:00
tristan	b93c4bf3e9	feat : ajout de l'export récap. salaire Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-03-16 12:25:41 +01:00
gitea-actions	f0ee489c26	chore: bump version to v0.1.40 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m22s Details	2026-03-16 08:13:46 +00:00
tristan	01f8058f56	fix : redirection après login + écran des heures chauffeurs Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-03-16 09:13:35 +01:00