chore: bump version to v0.1.60

.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>

CLAUDE.md

@@ -43,8 +43,15 @@
 ## Overtime Rules
 - Contracts <= 35h: +25% from 35h to 43h, +50% beyond
 - Contracts >= 39h: +25% from 39h to 43h, +50% beyond
+- CUSTOM contracts (weeklyHours ≠ 35 and ≠ 39, not INTERIM/FORFAIT): reference = actual contractual hours, no 25%/50% bonuses (1h overtime = 1h recovery), deficit doesn't impact balance
 - INTERIM: no overtime bonuses, no recovery time
 - Driver contracts: no overtime calculation
+- FORFAIT weekend/holiday bonus: each weekend or public holiday day worked gives bonus leave (full day if morning+afternoon, 0.5 if only one). Added to acquired days, no cap. PRESENCE mode only.
+
+## 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
 

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.1.51'
+    app.version: '0.1.60'

doc/functional-rules.md

@@ -122,6 +122,10 @@ Documents complementaires:
 - 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
+- Contrats CUSTOM (heures hebdo ≠ 35h et ≠ 39h, hors INTERIM/FORFAIT):
+  - référence heures sup = heures contractuelles réelles (ex: 4h → référence 4h)
+  - pas de bonus 25% ni 50% : 1 heure sup = 1 heure de récupération
+  - le déficit (travail < contrat) ne génère pas de récup mais n'impacte pas le solde
 - Nature `INTERIM`:
   - pas de bonus 25%
   - pas de bonus 50%
@@ -227,6 +231,7 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
         - 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`
+        - bonus weekend/férié: chaque jour travaillé un weekend ou jour férié donne 1 jour de congé supplémentaire (journée ≥ 5h = 1.0 jour, demi-journée > 0h et < 5h = 0.5 jour), sans plafond
         - 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
         - reste à prendre: `acquis - absences` (toutes absences, demi-journées incluses)
         - pas de samedi (`0`)
@@ -274,6 +279,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:
@@ -344,7 +350,28 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
 | CHAUFFEUR - samedi | WorkHour (samedi) | Samedis travaillés (chauffeurs uniquement) |
 | Observations | — | Colonne vide pour saisie manuelle |
 
-## 12) Notifications
+## 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

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">

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
 }

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
@@ -67,26 +67,26 @@
           <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">{{ formatMinutes(summary!.carryBonus25Minutes) }}</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) }}</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">{{ formatMinutes(summary!.carryBonus50Minutes) }}</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) }}</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) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.bonus25) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(monthReport.total25) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.base50) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.bonus50) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(monthReport.total50) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.total) }}</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) -->
@@ -162,13 +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(reste.base25) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.bonus25) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(reste.total25) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.base50) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.bonus50) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(reste.total50) }}</td>
-            <td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.total) }}</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>
@@ -258,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
@@ -470,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)

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()
   }

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"

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
 }

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`
+}

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');
+    }
+}

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');
+    }
+}

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
         ),
     ],

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
         ),
     ],

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')"

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;

src/Repository/WorkHourRepository.php

@@ -191,6 +191,57 @@ final class WorkHourRepository extends ServiceEntityRepository implements WorkHo
         return $result;
     }
 
+    /**
+     * Count weekend and public holiday worked days for forfait bonus leave (PRESENCE mode only).
+     * Morning + afternoon = 1.0 day, one only = 0.5 day.
+     *
+     * @param list<string> $publicHolidayDates Y-m-d formatted weekday public holiday dates
+     */
+    public function countWeekendAndHolidayWorkedDays(Employee $employee, DateTimeImmutable $from, DateTimeImmutable $to, array $publicHolidayDates = []): float
+    {
+        $targetDates = [];
+
+        // Collect weekend dates in range
+        for ($cursor = $from; $cursor <= $to; $cursor = $cursor->modify('+1 day')) {
+            if ((int) $cursor->format('N') >= 6) {
+                $targetDates[] = $cursor;
+            }
+        }
+
+        // Add weekday public holidays
+        foreach ($publicHolidayDates as $date) {
+            $targetDates[] = new DateTimeImmutable($date);
+        }
+
+        if ([] === $targetDates) {
+            return 0.0;
+        }
+
+        $dateStrings = array_map(static fn (DateTimeImmutable $d): string => $d->format('Y-m-d'), $targetDates);
+
+        /** @var list<WorkHour> $rows */
+        $rows = $this->createQueryBuilder('w')
+            ->andWhere('w.employee = :employee')
+            ->andWhere('w.workDate IN (:dates)')
+            ->andWhere('w.isPresentMorning = true OR w.isPresentAfternoon = true')
+            ->setParameter('employee', $employee)
+            ->setParameter('dates', $dateStrings)
+            ->getQuery()
+            ->getResult()
+        ;
+
+        $total = 0.0;
+        foreach ($rows as $row) {
+            if ($row->isPresentMorning() && $row->isPresentAfternoon()) {
+                $total += 1.0;
+            } else {
+                $total += 0.5;
+            }
+        }
+
+        return $total;
+    }
+
     /**
      * Return the set of Y-m-d dates where the employee has worked hours on the given dates.
      *
@@ -228,6 +279,55 @@ final class WorkHourRepository extends ServiceEntityRepository implements WorkHo
         return $result;
     }
 
+    public function isWeekFullyValidated(Employee $employee, DateTimeImmutable $from, DateTimeImmutable $to): bool
+    {
+        // Count weekdays (Mon-Fri) in range
+        $expectedWeekdays = 0;
+        for ($d = $from; $d <= $to; $d = $d->modify('+1 day')) {
+            if ((int) $d->format('N') <= 5) {
+                ++$expectedWeekdays;
+            }
+        }
+
+        if (0 === $expectedWeekdays) {
+            return false;
+        }
+
+        // Every weekday must have a work_hour row
+        $totalCount = (int) $this->createQueryBuilder('w')
+            ->select('COUNT(w.id)')
+            ->andWhere('w.employee = :employee')
+            ->andWhere('w.workDate >= :from')
+            ->andWhere('w.workDate <= :to')
+            ->setParameter('employee', $employee)
+            ->setParameter('from', $from)
+            ->setParameter('to', $to)
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+
+        if ($totalCount < $expectedWeekdays) {
+            return false;
+        }
+
+        // All rows must be validated
+        $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);

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);
+        });
     }
 }

src/Service/Rtt/RttRecoveryComputationService.php

@@ -206,20 +206,36 @@ final readonly class RttRecoveryComputationService
                 continue;
             }
 
-            $weekAnchorNature           = $naturesByDate[$employeeId][$weekDays[0]] ?? ContractNature::CDI;
-            $weekAnchorContract         = $employeeContractsByDate[$weekDays[0]] ?? null;
-            $isWeekPresenceTracking     = TrackingMode::PRESENCE->value === $weekAnchorContract?->getTrackingMode();
-            $disableOvertimeBonuses     = $this->hasDisabledOvertimeBonuses($weekAnchorContract, $weekAnchorNature);
-            $overtimeReferenceMinutes   = $this->computeWeeklyOvertimeReferenceMinutes($weekDays, $employeeContractsByDate);
+            $weekAnchorNature       = $naturesByDate[$employeeId][$weekDays[0]] ?? ContractNature::CDI;
+            $weekAnchorContract     = $employeeContractsByDate[$weekDays[0]] ?? null;
+            $isWeekPresenceTracking = TrackingMode::PRESENCE->value === $weekAnchorContract?->getTrackingMode();
+            $disableOvertimeBonuses = $this->hasDisabledOvertimeBonuses($weekAnchorContract, $weekAnchorNature);
+            $weekContractType       = ContractType::resolve(
+                $weekAnchorContract?->getName(),
+                $weekAnchorContract?->getTrackingMode(),
+                $weekAnchorContract?->getWeeklyHours()
+            );
+            $isCustomContract         = ContractType::CUSTOM === $weekContractType;
+            $overtimeReferenceMinutes = $isCustomContract
+                ? $this->computeWeeklyCustomReferenceMinutes($weekDays, $employeeContractsByDate)
+                : $this->computeWeeklyOvertimeReferenceMinutes($weekDays, $employeeContractsByDate);
             $overtime25StartMinutes     = $this->computeWeeklyOvertime25StartMinutes($weekDays, $employeeContractsByDate);
             $weeklyOvertimeTotalMinutes = $isWeekPresenceTracking
                 ? 0
                 : $weeklyTotalMinutes - $overtimeReferenceMinutes;
 
-            $base25  = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : max(0, min($weeklyTotalMinutes, 43 * 60) - $overtime25StartMinutes);
-            $bonus25 = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : (int) round($base25 * 0.25);
-            $base50  = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : max(0, $weeklyTotalMinutes - 43 * 60);
-            $bonus50 = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : (int) round($base50 * 0.5);
+            $base25  = ($isWeekPresenceTracking || $disableOvertimeBonuses || $isCustomContract) ? 0 : max(0, min($weeklyTotalMinutes, 43 * 60) - $overtime25StartMinutes);
+            $bonus25 = ($isWeekPresenceTracking || $disableOvertimeBonuses || $isCustomContract) ? 0 : (int) round($base25 * 0.25);
+            $base50  = ($isWeekPresenceTracking || $disableOvertimeBonuses || $isCustomContract) ? 0 : max(0, $weeklyTotalMinutes - 43 * 60);
+            $bonus50 = ($isWeekPresenceTracking || $disableOvertimeBonuses || $isCustomContract) ? 0 : (int) round($base50 * 0.5);
+
+            if ($isWeekPresenceTracking || $disableOvertimeBonuses) {
+                $totalMinutes = 0;
+            } elseif ($isCustomContract) {
+                $totalMinutes = max(0, $weeklyOvertimeTotalMinutes);
+            } else {
+                $totalMinutes = $weeklyOvertimeTotalMinutes + $bonus25 + $bonus50;
+            }
 
             $results[$weekKey] = new WeekRecoveryDetail(
                 overtimeMinutes: $weeklyOvertimeTotalMinutes,
@@ -227,9 +243,7 @@ final readonly class RttRecoveryComputationService
                 bonus25Minutes: $bonus25,
                 base50Minutes: $base50,
                 bonus50Minutes: $bonus50,
-                totalMinutes: ($isWeekPresenceTracking || $disableOvertimeBonuses)
-                    ? 0
-                    : $weeklyOvertimeTotalMinutes + $bonus25 + $bonus50,
+                totalMinutes: $totalMinutes,
             );
         }
 
@@ -326,6 +340,23 @@ final readonly class RttRecoveryComputationService
         return max(0, $end - $start);
     }
 
+    /**
+     * @param list<string>             $days
+     * @param array<string, ?Contract> $contractsByDate
+     */
+    private function computeWeeklyCustomReferenceMinutes(array $days, array $contractsByDate): int
+    {
+        $total = 0;
+        foreach ($days as $date) {
+            $isoDay   = (int) new DateTimeImmutable($date)->format('N');
+            $contract = $contractsByDate[$date] ?? null;
+            $hours    = $contract?->getWeeklyHours();
+            $total += $this->resolveDailyReferenceMinutes($hours, $isoDay);
+        }
+
+        return $total;
+    }
+
     /**
      * @param list<string>             $days
      * @param array<string, ?Contract> $contractsByDate

src/State/EmployeeLeaveSummaryProvider.php

@@ -535,10 +535,21 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         $type = $employee->getContract()?->getType();
         if (ContractType::FORFAIT === $type) {
             $businessDaysInPeriod = $this->countBusinessDays($from, $to);
+            $publicHolidays       = $this->buildPublicHolidayMap($from, $to);
+            $weekdayHolidays      = array_filter(
+                array_keys($publicHolidays),
+                static fn (string $date): bool => (int) new DateTimeImmutable($date)->format('N') <= 5
+            );
+            $bonusDays = $this->workHourRepository->countWeekendAndHolidayWorkedDays(
+                $employee,
+                $from,
+                $to,
+                array_values($weekdayHolidays)
+            );
 
             return [
                 'ruleCode'                => LeaveRuleCode::FORFAIT_218->value,
-                'acquiredDays'            => (float) max(0, $businessDaysInPeriod - self::FORFAIT_TARGET_WORKED_DAYS),
+                'acquiredDays'            => (float) max(0, $businessDaysInPeriod - self::FORFAIT_TARGET_WORKED_DAYS) + $bonusDays,
                 'acquiredSaturdays'       => 0.0,
                 'accrualPerMonth'         => 0.0,
                 'saturdayAccrualPerMonth' => 0.0,

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;
@@ -36,6 +37,7 @@ 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;
@@ -83,6 +85,16 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
             // 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);
@@ -236,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;
+    }
 }

src/State/LeaveRecapPrintProvider.php

@@ -13,6 +13,7 @@ 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;
@@ -32,6 +33,7 @@ class LeaveRecapPrintProvider implements ProviderInterface
         private EmployeeRttBalanceRepository $rttBalanceRepository,
         private EmployeeRttPaymentRepository $rttPaymentRepository,
         private EntityManagerInterface $entityManager,
+        private WorkHourRepository $workHourRepository,
     ) {}
 
     public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
@@ -142,6 +144,16 @@ class LeaveRecapPrintProvider implements ProviderInterface
         $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);
@@ -165,6 +177,24 @@ class LeaveRecapPrintProvider implements ProviderInterface
         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) {

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;
+    }
+}

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);
+    }
+}

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();