chore: bump version to v0.1.28

.claude/settings.local.json

@@ -6,7 +6,19 @@
       "Bash(php:*)",
       "Bash(docker compose:*)",
       "Bash(make test:*)",
-      "Bash(grep:*)"
+      "Bash(grep:*)",
+      "Bash(docker exec:*)",
+      "Bash(php8.3 bin/phpunit tests/State/EmployeeWriteProcessorTest.php --filter=testSetsEntryDateOnNewEmployee 2>&1)",
+      "Read(//usr/bin/**)",
+      "Read(//usr/local/bin/**)",
+      "Bash(command -v php8.2)",
+      "Bash(command -v php8.1)",
+      "Bash(ls /usr/bin/php*)",
+      "Read(//opt/**)",
+      "Read(//home/m-tristan/.nix-profile/**)",
+      "Read(//home/m-tristan/.local/bin/**)",
+      "Bash(env)",
+      "Bash(ls /home/m-tristan/workspace/SIRH/docker* /home/m-tristan/workspace/SIRH/Makefile 2>/dev/null; cat /home/m-tristan/workspace/SIRH/Makefile 2>/dev/null | grep -E \"\\(phpunit|test|php\\)\" | head -20)"
     ]
   }
 }

config/services.yaml

@@ -22,6 +22,10 @@ services:
     App\:
         resource: '../src/'
 
+    App\Service\PublicHolidayService:
+        arguments:
+            $holidayUrl: '%env(HOLIDAY_URL)%'
+
     App\Repository\Contract\AbsenceReadRepositoryInterface: '@App\Repository\AbsenceRepository'
     App\Repository\Contract\EmployeeContractPeriodReadRepositoryInterface: '@App\Repository\EmployeeContractPeriodRepository'
     App\Repository\Contract\EmployeeScopedRepositoryInterface: '@App\Repository\EmployeeRepository'

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.1.20'
+    app.version: '0.1.28'

doc/functional-rules.md

@@ -169,11 +169,13 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
         - acquis annuel samedi: `5`
         - 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
         - 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
       - 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
@@ -198,13 +200,16 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
       - lecture des compteurs:
         - `acquis` = droits reportés de l'exercice N-1 (après application des règles de soldé)
         - `en cours d'acquisition` = total droits générés sur l'exercice N (jours + samedis en cours), sans detail séparé en UI
+        - `en cours d'acquisition` est arrêté au dernier jour du mois précédent
       - règle de consommation:
         - les absences s'imputent d'abord sur `acquis`, puis sur `en cours d'acquisition`
         - la prise sur `en cours d'acquisition` est autorisée (usage anticipé)
         - `en cours d'acquisition` peut devenir négatif si la prise dépasse le généré (ex: `2.08 - 3 = -0.92`), puis se reconstitue avec les acquisitions suivantes
       - date d'arret de calcul:
-        - les compteurs sont calculés jusqu'au dernier jour du mois précédent (le mois en cours est exclu)
-        - exemple: au `04/03/2026`, l'arret de calcul est le `28/02/2026` (ou `29/02` en année bissextile)
+        - `reste à prendre` est calculé en prévisionnel jusqu'à la fin de l'exercice
+        - les absences futures déjà posées sur l'exercice sont déduites du `reste à prendre`
+        - `en cours d'acquisition` reste calculé jusqu'au dernier jour du mois précédent
+        - exemple: au `11/03/2026`, l'exercice `2026` déduit les absences posées jusqu'au `31/05/2026`, mais l'acquisition reste arrêtée au `28/02/2026`
     - hors périmètre phase 1: `INTERIM` (retour non supporté)
   - onglet `RTT`:
     - endpoint de synthèse: `GET /api/employees/{id}/rtt-summary?year=YYYY`

frontend/components/employees/ContractTab.vue

@@ -162,9 +162,9 @@
           <input id="create-contract-start-date" v-model="createContractForm.startDate" type="date" :class="createContractStartDateFieldClass" />
         </div>
 
-        <div v-if="requiresCreateContractEndDate">
+        <div v-if="showsCreateContractEndDate">
           <label class="text-md font-semibold text-neutral-700" for="create-contract-end-date">
-            Fin contrat <span class="text-red-600">*</span>
+            Fin contrat <span v-if="requiresCreateContractEndDate" class="text-red-600">*</span>
           </label>
           <input id="create-contract-end-date" v-model="createContractForm.endDate" type="date" :class="createContractEndDateFieldClass" />
         </div>
@@ -235,6 +235,7 @@ defineProps<{
   createContractNatureFieldClass: string
   createContractFieldClass: string
   createContractStartDateFieldClass: string
+  showsCreateContractEndDate: boolean
   requiresCreateContractEndDate: boolean
   createContractEndDateFieldClass: string
   isCreateContractFormValid: boolean

frontend/composables/useEmployeeDetailPage.ts

@@ -11,7 +11,7 @@ import { getEmployeeRttSummary, createRttPayment } from '~/services/employee-rtt
 import { getEmployee, updateEmployee } from '~/services/employees'
 import { listPublicHolidays } from '~/services/public-holidays'
 import { formatNullableYmdToFr, getTodayYmd, shiftYmd } from '~/utils/date'
-import { contractNatureLabel, isContractNature, requiresContractEndDate } from '~/utils/contract'
+import { contractNatureLabel, isContractNature, requiresContractEndDate, showsContractEndDate } from '~/utils/contract'
 
 export const useEmployeeDetailPage = () => {
   const route = useRoute()
@@ -99,6 +99,7 @@ export const useEmployeeDetailPage = () => {
   const isContractEndDateValid = computed(() => contractForm.endDate !== '')
   const showContractEndDateError = computed(() => validationTouched.endDate && !isContractEndDateValid.value)
 
+  const showsCreateContractEndDate = computed(() => showsContractEndDate(createContractForm.contractNature))
   const requiresCreateContractEndDate = computed(() => requiresContractEndDate(createContractForm.contractNature))
   const isCreateContractValid = computed(() => createContractForm.contractId !== '')
   const isCreateContractNatureValid = computed(() => isContractNature(createContractForm.contractNature))
@@ -314,8 +315,8 @@ export const useEmployeeDetailPage = () => {
     await loadEmployee()
   }
 
-  watch(requiresCreateContractEndDate, (required) => {
-    if (!required) {
+  watch(showsCreateContractEndDate, (shows) => {
+    if (!shows) {
       createContractForm.endDate = ''
     }
   })
@@ -353,6 +354,7 @@ export const useEmployeeDetailPage = () => {
     createContractNatureFieldClass,
     createContractFieldClass,
     createContractStartDateFieldClass,
+    showsCreateContractEndDate,
     requiresCreateContractEndDate,
     createContractEndDateFieldClass,
     isCreateContractFormValid,

frontend/pages/employees/[id].vue

@@ -12,9 +12,12 @@
 
         <div v-else class="flex min-h-0 flex-1 flex-col">
             <div class="flex items-center justify-between">
-                <h1 class="text-4xl font-bold text-primary-500">{{ employee.firstName }} {{ employee.lastName }}</h1>
+                <div>
+                    <h1 class="text-[32px] font-bold">{{ employee.firstName }} {{ employee.lastName }}</h1>
+                    <p>Date d'entrée : {{ employee.entryDate ? employee.entryDate.split('-').reverse().join('/') : '-' }}</p>
+                </div>
                 <div class="text-right">
-                    <p class="font-bold text-[20px]">{{ contractNatureLabel(employee.currentContractNature) }} {{ employeeContractWorkLabel }}</p>
+                    <p class="font-bold text-[22px]">{{ contractNatureLabel(employee.currentContractNature) }} {{ employeeContractWorkLabel }}</p>
                     <p class="text-[18px]">{{ employee.site?.name ?? '-' }}</p>
                 </div>
             </div>
@@ -78,6 +81,7 @@
                     :create-contract-nature-field-class="createContractNatureFieldClass"
                     :create-contract-field-class="createContractFieldClass"
                     :create-contract-start-date-field-class="createContractStartDateFieldClass"
+                    :shows-create-contract-end-date="showsCreateContractEndDate"
                     :requires-create-contract-end-date="requiresCreateContractEndDate"
                     :create-contract-end-date-field-class="createContractEndDateFieldClass"
                     :is-create-contract-form-valid="isCreateContractFormValid"
@@ -131,6 +135,7 @@ const {
     createContractNatureFieldClass,
     createContractFieldClass,
     createContractStartDateFieldClass,
+    showsCreateContractEndDate,
     requiresCreateContractEndDate,
     createContractEndDateFieldClass,
     isCreateContractFormValid,

frontend/pages/employees/index.vue

@@ -51,6 +51,7 @@
                         <p><strong>Type:</strong> {{ contractNatureLabel(employee.currentContractNature) }}</p>
                         <p><strong>Temps de travail:</strong> {{ employee.contract?.name ?? '-' }}</p>
                         <p><strong>Site:</strong> {{ employee.site?.name ?? '-' }}</p>
+                        <p><strong>Date d'entrée :</strong> {{ employee.entryDate ? employee.entryDate.split('-').reverse().join('/') : '-' }}</p>
                     </div>
                 </div>
             </NuxtLink>
@@ -154,7 +155,7 @@
                             La date de début est obligatoire.
                         </p>
                     </div>
-                    <div v-if="requiresContractEndDateComputed">
+                    <div v-if="showsContractEndDateComputed">
                         <label class="text-md font-semibold text-neutral-700" for="contract-end-date">
                             Fin contrat
                             <span v-if="requiresContractEndDateComputed" class="text-red-600">*</span>
@@ -166,7 +167,7 @@
                             :class="contractEndDateFieldClass"
                         />
                         <p v-if="showContractEndDateError" class="mt-1 text-sm text-red-600">
-                            La date de fin est obligatoire pour un CDD ou un intérim.
+                            La date de fin est obligatoire pour un CDD.
                         </p>
                     </div>
                 </template>
@@ -199,7 +200,7 @@ 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 {contractNatureLabel, isContractNature, requiresContractEndDate} from '~/utils/contract'
+import {contractNatureLabel, isContractNature, requiresContractEndDate, showsContractEndDate} from '~/utils/contract'
 
 useHead({
     title: 'Employés'
@@ -264,6 +265,7 @@ const isSiteValid = computed(() => form.siteId !== '')
 const isContractValid = computed(() => form.contractId !== '')
 const isContractNatureValid = computed(() => isContractNature(form.contractNature))
 const isContractStartDateValid = computed(() => form.contractStartDate !== '')
+const showsContractEndDateComputed = computed(() => showsContractEndDate(form.contractNature))
 const requiresContractEndDateComputed = computed(() => requiresContractEndDate(form.contractNature))
 const isContractEndDateValid = computed(() => {
     if (!requiresContractEndDateComputed.value) return true
@@ -429,7 +431,7 @@ const handleSubmit = async () => {
                 contractId: Number(form.contractId),
                 contractNature: form.contractNature,
                 contractStartDate: form.contractStartDate,
-                contractEndDate: requiresContractEndDateComputed.value ? form.contractEndDate : null
+                contractEndDate: form.contractEndDate || null
             })
         }
 
@@ -460,8 +462,8 @@ watch(isDrawerOpen, (isOpen) => {
     }
 })
 
-watch(requiresContractEndDateComputed, (required) => {
-    if (!required) {
+watch(showsContractEndDateComputed, (shows) => {
+    if (!shows) {
         form.contractEndDate = ''
     }
 })

frontend/services/dto/employee.ts

@@ -22,4 +22,5 @@ export type Employee = {
   currentContractEndDate?: string | null
   contractHistory?: ContractHistoryItem[]
   displayOrder?: number
+  entryDate?: string | null
 }

frontend/utils/contract.ts

@@ -8,10 +8,14 @@ export const contractNatureLabel = (value?: ContractNature) => {
   return 'CDI'
 }
 
-export const requiresContractEndDate = (nature: ContractNature) => {
+export const showsContractEndDate = (nature: ContractNature) => {
   return nature === 'CDD' || nature === 'INTERIM'
 }
 
+export const requiresContractEndDate = (nature: ContractNature) => {
+  return nature === 'CDD'
+}
+
 export const isContractNature = (value: string): value is ContractNature => {
   return (CONTRACT_NATURES as readonly string[]).includes(value)
 }

migrations/Version20260312120000.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260312120000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add entry_date column to employees table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE employees ADD entry_date DATE DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE employees DROP entry_date');
+    }
+}

src/Entity/Employee.php

@@ -14,7 +14,9 @@ use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Context;
 use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 
 #[ApiResource(
     normalizationContext: ['groups' => ['employee:read', 'site:read']],
@@ -57,6 +59,11 @@ class Employee
     #[Groups(['employee:read', 'employee:write'])]
     private int $displayOrder = 0;
 
+    #[ORM\Column(type: 'date_immutable', nullable: true)]
+    #[Groups(['employee:read'])]
+    #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
+    private ?DateTimeImmutable $entryDate = null;
+
     #[ORM\Column(type: 'datetime_immutable')]
     private DateTimeImmutable $createdAt;
 
@@ -166,6 +173,18 @@ class Employee
         return $this;
     }
 
+    public function getEntryDate(): ?DateTimeImmutable
+    {
+        return $this->entryDate;
+    }
+
+    public function setEntryDate(?DateTimeImmutable $entryDate): self
+    {
+        $this->entryDate = $entryDate;
+
+        return $this;
+    }
+
     public function getContractNature(): ?string
     {
         return $this->contractNature;

src/Service/Leave/LeaveBalanceComputationService.php

@@ -117,14 +117,14 @@ final readonly class LeaveBalanceComputationService
     {
         if (LeaveRuleCode::FORFAIT_218 === $ruleCode) {
             return [
-                new DateTimeImmutable(sprintf('%d-01-01', $year)),
-                new DateTimeImmutable(sprintf('%d-12-31', $year)),
+                new DateTimeImmutable(sprintf('%d-01-01 00:00:00', $year)),
+                new DateTimeImmutable(sprintf('%d-12-31 00:00:00', $year)),
             ];
         }
 
         return [
-            new DateTimeImmutable(sprintf('%d-06-01', $year - 1)),
-            new DateTimeImmutable(sprintf('%d-05-31', $year)),
+            new DateTimeImmutable(sprintf('%d-06-01 00:00:00', $year - 1)),
+            new DateTimeImmutable(sprintf('%d-05-31 00:00:00', $year)),
         ];
     }
 
@@ -145,7 +145,7 @@ final readonly class LeaveBalanceComputationService
 
         $oldestStartDate = null;
         foreach ($history as $item) {
-            $start = DateTimeImmutable::createFromFormat('Y-m-d', $item->startDate);
+            $start = $this->parseYmdDate($item->startDate);
             if (!$start) {
                 continue;
             }
@@ -197,14 +197,14 @@ final readonly class LeaveBalanceComputationService
     ): ?DateTimeImmutable {
         $earliest = null;
         foreach ($employee->getContractHistory() as $period) {
-            $start = DateTimeImmutable::createFromFormat('Y-m-d', $period->startDate);
+            $start = $this->parseYmdDate($period->startDate);
             if (!$start) {
                 continue;
             }
 
             $end = null;
             if (null !== $period->endDate && '' !== trim($period->endDate)) {
-                $end = DateTimeImmutable::createFromFormat('Y-m-d', $period->endDate);
+                $end = $this->parseYmdDate($period->endDate);
             }
 
             if ($start > $to) {
@@ -268,11 +268,37 @@ final readonly class LeaveBalanceComputationService
             return 0.0;
         }
 
-        $monthsElapsed = ((int) $periodEnd->format('Y') - (int) $periodStart->format('Y')) * 12
-            + ((int) $periodEnd->format('n') - (int) $periodStart->format('n'))
-            + 1;
+        $periodStart   = $this->normalizeDate($periodStart);
+        $periodEnd     = $this->normalizeDate($periodEnd);
+        $coveredMonths = 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);
+            if ($monthEnd > $periodEnd) {
+                $monthEnd = $periodEnd;
+            }
 
-        return min($annualCap, $monthsElapsed * $accrualPerMonth);
+            $coveredDays = ((int) $monthEnd->diff($monthStart)->format('%a')) + 1;
+            $daysInMonth = (int) $cursor->format('t');
+            $coveredMonths += $coveredDays / $daysInMonth;
+
+            $cursor = $cursor->modify('first day of next month');
+        }
+
+        return min($annualCap, $coveredMonths * $accrualPerMonth);
+    }
+
+    private function parseYmdDate(string $value): ?DateTimeImmutable
+    {
+        $date = DateTimeImmutable::createFromFormat('!Y-m-d', trim($value));
+
+        return $date instanceof DateTimeImmutable ? $date : null;
+    }
+
+    private function normalizeDate(DateTimeImmutable $date): DateTimeImmutable
+    {
+        return $date->setTime(0, 0);
     }
 
     private function countBusinessDays(DateTimeImmutable $from, DateTimeImmutable $to): int
@@ -349,14 +375,25 @@ final readonly class LeaveBalanceComputationService
             }
 
             for ($cursor = $rangeStart; $cursor <= $rangeEnd; $cursor = $cursor->modify('+1 day')) {
+                $dayOfWeek = (int) $cursor->format('N');
+
+                if ($splitSaturdays) {
+                    if (7 === $dayOfWeek) {
+                        continue;
+                    }
+                } else {
+                    if ($dayOfWeek >= 6) {
+                        continue;
+                    }
+                }
+
                 [$am, $pm] = $this->resolveSegmentsForDate($absence, $cursor->format('Y-m-d'));
                 $dayAmount = ($am ? 0.5 : 0.0) + ($pm ? 0.5 : 0.0);
                 if ($dayAmount <= 0.0) {
                     continue;
                 }
 
-                $isSaturday = $splitSaturdays && '6' === $cursor->format('N');
-                if ($isSaturday) {
+                if ($splitSaturdays && 6 === $dayOfWeek) {
                     $takenSaturdays += $dayAmount;
                 } else {
                     $takenDays += $dayAmount;

src/Service/PublicHolidayService.php

@@ -13,12 +13,11 @@ use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Throwable;
 
-final class PublicHolidayService implements PublicHolidayServiceInterface
+final readonly class PublicHolidayService implements PublicHolidayServiceInterface
 {
-    private const string BASE_URL = 'https://calendrier.api.gouv.fr/jours-feries/';
-
     public function __construct(
-        private readonly HttpClientInterface $client,
+        private HttpClientInterface $client,
+        private string $holidayUrl
     ) {}
 
     /**
@@ -31,7 +30,7 @@ final class PublicHolidayService implements PublicHolidayServiceInterface
     public function getHolidaysDay(string $zone): array
     {
         $zone = strtolower(trim($zone));
-        $url  = self::BASE_URL."{$zone}.json";
+        $url  = $this->holidayUrl."{$zone}.json";
 
         try {
             $response = $this->client->request(
@@ -61,7 +60,7 @@ final class PublicHolidayService implements PublicHolidayServiceInterface
     {
         $zone  = strtolower(trim($zone));
         $years = trim($years);
-        $url   = self::BASE_URL."{$zone}/{$years}.json";
+        $url   = $this->holidayUrl."{$zone}/{$years}.json";
 
         try {
             $response = $this->client->request('GET', $url);

src/State/EmployeeLeaveSummaryProvider.php

@@ -163,18 +163,19 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
 
             $effectiveFrom   = $this->resolveEffectivePeriodStart($employee, $from, $to);
             $hasShiftedStart = $effectiveFrom > $from;
-            if ($hasShiftedStart) {
+            if ($hasShiftedStart && null === $openingBalance) {
                 $carryDays      = 0.0;
                 $carrySaturdays = 0.0;
             }
 
-            $calculationEnd = $this->resolveCalculationEndDate($leavePolicy['ruleCode'], $year, $to);
-            $generatedDays  = $leavePolicy['accrualPerMonth'] > 0.0
+            $accrualCalculationEnd = $this->resolveAccrualCalculationEndDate($leavePolicy['ruleCode'], $year, $to, $employee);
+            $takenCalculationEnd   = $this->resolveTakenCalculationEndDate($to, $employee);
+            $generatedDays         = $leavePolicy['accrualPerMonth'] > 0.0
                 ? $this->computeAccruedDaysFromStart(
                     $leavePolicy['acquiredDays'],
                     $leavePolicy['accrualPerMonth'],
                     $effectiveFrom,
-                    $calculationEnd
+                    $accrualCalculationEnd
                 )
                 : 0.0;
             $generatedSaturdays = $leavePolicy['saturdayAccrualPerMonth'] > 0.0
@@ -182,14 +183,14 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
                     $leavePolicy['acquiredSaturdays'],
                     $leavePolicy['saturdayAccrualPerMonth'],
                     $effectiveFrom,
-                    $calculationEnd
+                    $accrualCalculationEnd
                 )
                 : 0.0;
             $absences                     = $this->absenceRepository->findByEmployeeAndOverlappingDateRange($employee, $from, $to);
             [$takenDays, $takenSaturdays] = $this->computeTakenAbsences(
                 $absences,
                 $effectiveFrom,
-                $calculationEnd,
+                $takenCalculationEnd,
                 $leavePolicy['countOnlyCp'],
                 $leavePolicy['splitSaturdays']
             );
@@ -279,14 +280,14 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
     ): ?DateTimeImmutable {
         $earliest = null;
         foreach ($employee->getContractHistory() as $period) {
-            $start = DateTimeImmutable::createFromFormat('Y-m-d', $period->startDate);
+            $start = $this->parseYmdDate($period->startDate);
             if (!$start instanceof DateTimeImmutable) {
                 continue;
             }
 
             $end = null;
             if (null !== $period->endDate && '' !== trim($period->endDate)) {
-                $end = DateTimeImmutable::createFromFormat('Y-m-d', $period->endDate);
+                $end = $this->parseYmdDate($period->endDate);
             }
 
             if ($start > $to) {
@@ -343,20 +344,32 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             return 0.0;
         }
 
-        $monthsElapsed = ((int) $periodEnd->format('Y') - (int) $periodStart->format('Y')) * 12
-            + ((int) $periodEnd->format('n') - (int) $periodStart->format('n'))
-            + 1;
-        if ($monthsElapsed < 0) {
-            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);
+        while ($cursor <= $periodEnd) {
+            $monthStart = $cursor > $periodStart ? $cursor : $periodStart;
+            $monthEnd   = $cursor->modify('last day of this month')->setTime(0, 0);
+            if ($monthEnd > $periodEnd) {
+                $monthEnd = $periodEnd;
+            }
+
+            $coveredDays = ((int) $monthEnd->diff($monthStart)->format('%a')) + 1;
+            $daysInMonth = (int) $cursor->format('t');
+            $coveredMonths += $coveredDays / $daysInMonth;
+
+            $cursor = $cursor->modify('first day of next month');
         }
 
-        return min($acquiredDays, $monthsElapsed * $accrualPerMonth);
+        return min($acquiredDays, $coveredMonths * $accrualPerMonth);
     }
 
-    private function resolveCalculationEndDate(
+    private function resolveAccrualCalculationEndDate(
         string $ruleCode,
         int $year,
-        DateTimeImmutable $periodEnd
+        DateTimeImmutable $periodEnd,
+        Employee $employee
     ): ?DateTimeImmutable {
         $today       = new DateTimeImmutable('today');
         $currentYear = LeaveRuleCode::FORFAIT_218->value === $ruleCode
@@ -364,18 +377,46 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             : $this->resolveCurrentLeaveYear($today);
 
         if ($year < $currentYear) {
-            return $periodEnd;
-        }
-        if ($year > $currentYear) {
-            return null;
+            $end = $periodEnd;
+        } elseif ($year > $currentYear) {
+            $end = null;
+        } else {
+            $lastDayPreviousMonth = $today
+                ->modify('first day of this month')
+                ->modify('-1 day')
+                ->setTime(0, 0)
+            ;
+            $end = $lastDayPreviousMonth < $periodEnd ? $lastDayPreviousMonth : $periodEnd;
         }
 
-        $lastDayPreviousMonth = $today
-            ->modify('first day of this month')
-            ->modify('-1 day')
-        ;
+        // Cap at contract end date if the employee has left.
+        $contractEndRaw = $employee->getCurrentContractEndDate();
+        if (null !== $end && null !== $contractEndRaw && '' !== trim($contractEndRaw)) {
+            $contractEnd = $this->parseYmdDate($contractEndRaw);
+            if ($contractEnd instanceof DateTimeImmutable && $contractEnd < $end) {
+                $end = $contractEnd;
+            }
+        }
 
-        return $lastDayPreviousMonth < $periodEnd ? $lastDayPreviousMonth : $periodEnd;
+        return $end;
+    }
+
+    private function resolveTakenCalculationEndDate(
+        DateTimeImmutable $periodEnd,
+        Employee $employee
+    ): ?DateTimeImmutable {
+        $end = $periodEnd;
+
+        // Cap at contract end date if the employee has left.
+        $contractEndRaw = $employee->getCurrentContractEndDate();
+        if (null !== $end && null !== $contractEndRaw && '' !== trim($contractEndRaw)) {
+            $contractEnd = $this->parseYmdDate($contractEndRaw);
+            if ($contractEnd instanceof DateTimeImmutable && $contractEnd < $end) {
+                $end = $contractEnd;
+            }
+        }
+
+        return $end;
     }
 
     /**
@@ -491,8 +532,8 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
     private function resolveLeavePeriodBounds(int $leaveYear): array
     {
         // Exercice CP "2026" = du 1er juin 2025 au 31 mai 2026.
-        $from = new DateTimeImmutable(sprintf('%d-06-01', $leaveYear - 1));
-        $to   = new DateTimeImmutable(sprintf('%d-05-31', $leaveYear));
+        $from = new DateTimeImmutable(sprintf('%d-06-01 00:00:00', $leaveYear - 1));
+        $to   = new DateTimeImmutable(sprintf('%d-05-31 00:00:00', $leaveYear));
 
         return [$from, $to];
     }
@@ -502,12 +543,12 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
      */
     private function resolveForfaitYearBounds(Employee $employee, int $year): array
     {
-        $from = new DateTimeImmutable(sprintf('%d-01-01', $year));
-        $to   = new DateTimeImmutable(sprintf('%d-12-31', $year));
+        $from = new DateTimeImmutable(sprintf('%d-01-01 00:00:00', $year));
+        $to   = new DateTimeImmutable(sprintf('%d-12-31 00:00:00', $year));
 
         $contractStartRaw = $employee->getCurrentContractStartDate();
         if (null !== $contractStartRaw && '' !== trim($contractStartRaw)) {
-            $contractStart = DateTimeImmutable::createFromFormat('Y-m-d', $contractStartRaw);
+            $contractStart = $this->parseYmdDate($contractStartRaw);
             if ($contractStart instanceof DateTimeImmutable && $contractStart > $from) {
                 $from = $contractStart;
             }
@@ -515,7 +556,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
 
         $contractEndRaw = $employee->getCurrentContractEndDate();
         if (null !== $contractEndRaw && '' !== trim($contractEndRaw)) {
-            $contractEnd = DateTimeImmutable::createFromFormat('Y-m-d', $contractEndRaw);
+            $contractEnd = $this->parseYmdDate($contractEndRaw);
             if ($contractEnd instanceof DateTimeImmutable && $contractEnd < $to) {
                 $to = $contractEnd;
             }
@@ -553,7 +594,7 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
 
         $oldestStartDate = null;
         foreach ($history as $item) {
-            $start = DateTimeImmutable::createFromFormat('Y-m-d', $item->startDate);
+            $start = $this->parseYmdDate($item->startDate);
             if (!$start) {
                 continue;
             }
@@ -582,6 +623,18 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
         return $firstYear;
     }
 
+    private function parseYmdDate(string $value): ?DateTimeImmutable
+    {
+        $date = DateTimeImmutable::createFromFormat('!Y-m-d', trim($value));
+
+        return $date instanceof DateTimeImmutable ? $date : null;
+    }
+
+    private function normalizeDate(DateTimeImmutable $date): DateTimeImmutable
+    {
+        return $date->setTime(0, 0);
+    }
+
     /**
      * @param list<Absence> $absences
      *
@@ -622,14 +675,27 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
             }
 
             for ($cursor = $rangeStart; $cursor <= $rangeEnd; $cursor = $cursor->modify('+1 day')) {
+                $dayOfWeek = (int) $cursor->format('N');
+
+                if ($splitSaturdays) {
+                    // Mode CDI/CDD : dimanche ignoré, samedi compté séparément.
+                    if (7 === $dayOfWeek) {
+                        continue;
+                    }
+                } else {
+                    // Mode forfait : seuls les jours ouvrés (lun-ven) comptent.
+                    if ($dayOfWeek >= 6) {
+                        continue;
+                    }
+                }
+
                 [$am, $pm] = $this->resolveSegmentsForDate($absence, $cursor->format('Y-m-d'));
                 $dayAmount = ($am ? 0.5 : 0.0) + ($pm ? 0.5 : 0.0);
                 if ($dayAmount <= 0.0) {
                     continue;
                 }
 
-                $isSaturday = $splitSaturdays && '6' === $cursor->format('N');
-                if ($isSaturday && $splitSaturdays) {
+                if ($splitSaturdays && 6 === $dayOfWeek) {
                     $takenSaturdays += $dayAmount;
                 } else {
                     $takenDays += $dayAmount;

src/State/EmployeeWriteProcessor.php

@@ -68,6 +68,9 @@ final readonly class EmployeeWriteProcessor implements ProcessorInterface
                 nature: $nature
             );
 
+            $data->setEntryDate($startDate);
+            $this->entityManager->flush();
+
             return $result;
         }
 

tests/Service/Leave/LeaveBalanceComputationServiceTest.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\Service\Leave;
+
+use App\Service\Leave\LeaveBalanceComputationService;
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+
+/**
+ * @internal
+ */
+final class LeaveBalanceComputationServiceTest extends TestCase
+{
+    public function testComputeAccruedDaysProratesPartialFirstMonth(): void
+    {
+        $service = new ReflectionClass(LeaveBalanceComputationService::class)->newInstanceWithoutConstructor();
+        $method  = new ReflectionClass(LeaveBalanceComputationService::class)->getMethod('computeAccruedDays');
+
+        $result = $method->invoke(
+            $service,
+            25.0,
+            25.0 / 12.0,
+            new DateTimeImmutable('2025-06-10'),
+            new DateTimeImmutable('2026-02-28')
+        );
+
+        self::assertEqualsWithDelta(18.125, $result, 0.0001);
+    }
+
+    public function testComputeAccruedDaysTotalMatchesAlainCase(): void
+    {
+        $service = new ReflectionClass(LeaveBalanceComputationService::class)->newInstanceWithoutConstructor();
+        $method  = new ReflectionClass(LeaveBalanceComputationService::class)->getMethod('computeAccruedDays');
+
+        $days = $method->invoke(
+            $service,
+            25.0,
+            25.0 / 12.0,
+            new DateTimeImmutable('2025-06-10'),
+            new DateTimeImmutable('2026-02-28')
+        );
+        $saturdays = $method->invoke(
+            $service,
+            5.0,
+            5.0 / 12.0,
+            new DateTimeImmutable('2025-06-10'),
+            new DateTimeImmutable('2026-02-28')
+        );
+
+        self::assertEqualsWithDelta(21.75, $days + $saturdays, 0.0001);
+    }
+
+    public function testComputeAccruedDaysIncludesLastDayOfMonthDespiteTimeComponents(): void
+    {
+        $service = new ReflectionClass(LeaveBalanceComputationService::class)->newInstanceWithoutConstructor();
+        $method  = new ReflectionClass(LeaveBalanceComputationService::class)->getMethod('computeAccruedDays');
+
+        $result = $method->invoke(
+            $service,
+            25.0,
+            25.0 / 12.0,
+            new DateTimeImmutable('2026-02-01 12:50:18'),
+            new DateTimeImmutable('2026-02-28 00:00:00')
+        );
+
+        self::assertEqualsWithDelta(25.0 / 12.0, $result, 0.0001);
+    }
+}

tests/State/EmployeeLeaveSummaryProviderTest.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Tests\State;
+
+use App\State\EmployeeLeaveSummaryProvider;
+use DateTimeImmutable;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+
+/**
+ * @internal
+ */
+final class EmployeeLeaveSummaryProviderTest extends TestCase
+{
+    public function testComputeAccruedDaysFromStartProratesPartialFirstMonth(): void
+    {
+        $provider = new ReflectionClass(EmployeeLeaveSummaryProvider::class)->newInstanceWithoutConstructor();
+        $method   = new ReflectionClass(EmployeeLeaveSummaryProvider::class)->getMethod('computeAccruedDaysFromStart');
+
+        $result = $method->invoke(
+            $provider,
+            25.0,
+            25.0 / 12.0,
+            new DateTimeImmutable('2025-06-10'),
+            new DateTimeImmutable('2026-02-28')
+        );
+
+        self::assertEqualsWithDelta(18.125, $result, 0.0001);
+    }
+
+    public function testComputeAccruingDaysTotalMatchesAlainCase(): void
+    {
+        $provider = new ReflectionClass(EmployeeLeaveSummaryProvider::class)->newInstanceWithoutConstructor();
+        $method   = new ReflectionClass(EmployeeLeaveSummaryProvider::class)->getMethod('computeAccruedDaysFromStart');
+
+        $days = $method->invoke(
+            $provider,
+            25.0,
+            25.0 / 12.0,
+            new DateTimeImmutable('2025-06-10'),
+            new DateTimeImmutable('2026-02-28')
+        );
+        $saturdays = $method->invoke(
+            $provider,
+            5.0,
+            5.0 / 12.0,
+            new DateTimeImmutable('2025-06-10'),
+            new DateTimeImmutable('2026-02-28')
+        );
+
+        self::assertEqualsWithDelta(21.75, $days + $saturdays, 0.0001);
+    }
+
+    public function testComputeAccruedDaysFromStartIncludesLastDayOfMonth(): void
+    {
+        $provider = new ReflectionClass(EmployeeLeaveSummaryProvider::class)->newInstanceWithoutConstructor();
+        $method   = new ReflectionClass(EmployeeLeaveSummaryProvider::class)->getMethod('computeAccruedDaysFromStart');
+
+        $result = $method->invoke(
+            $provider,
+            25.0,
+            25.0 / 12.0,
+            new DateTimeImmutable('2026-02-01 12:50:18'),
+            new DateTimeImmutable('2026-02-28 00:00:00')
+        );
+
+        self::assertEqualsWithDelta(25.0 / 12.0, $result, 0.0001);
+    }
+}

tests/State/EmployeeWriteProcessorTest.php

@@ -6,6 +6,7 @@ namespace App\Tests\State;
 
 use ApiPlatform\Metadata\Delete;
 use ApiPlatform\Metadata\Patch;
+use ApiPlatform\Metadata\Post;
 use ApiPlatform\State\ProcessorInterface;
 use App\Entity\Contract;
 use App\Entity\Employee;
@@ -194,6 +195,54 @@ final class EmployeeWriteProcessorTest extends TestCase
         self::assertSame($employee, $result);
     }
 
+    public function testSetsEntryDateOnNewEmployee(): void
+    {
+        $employee = new Employee();
+        $employee->setFirstName('Jane');
+        $employee->setLastName('Doe');
+        $employee->setContractStartDate('2026-04-01');
+        $employee->setContractNature('CDI');
+
+        $contract = new Contract()
+            ->setName('35h')
+            ->setTrackingMode(Contract::TRACKING_TIME)
+            ->setWeeklyHours(35)
+        ;
+        $employee->setContract($contract);
+
+        $persistProcessor     = $this->createMock(ProcessorInterface::class);
+        $removeProcessor      = $this->createStub(ProcessorInterface::class);
+        $entityManager        = $this->createStub(EntityManagerInterface::class);
+        $periodRepository     = $this->createStub(EmployeeContractPeriodReadRepositoryInterface::class);
+        $changeRequestFactory = new EmployeeContractChangeRequestFactory();
+        $periodManager        = $this->createMock(EmployeeContractPeriodManagerInterface::class);
+
+        $persistProcessor
+            ->expects(self::once())
+            ->method('process')
+            ->willReturn($employee)
+        ;
+
+        $periodManager
+            ->expects(self::once())
+            ->method('ensureContractPeriodExists')
+        ;
+
+        $processor = new EmployeeWriteProcessor(
+            $persistProcessor,
+            $removeProcessor,
+            $entityManager,
+            $periodRepository,
+            $changeRequestFactory,
+            $periodManager
+        );
+
+        $processor->process($employee, new Post());
+
+        self::assertNotNull($employee->getEntryDate());
+        self::assertSame('2026-04-01', $employee->getEntryDate()->format('Y-m-d'));
+    }
+
     public function testDeleteOperationDelegatesToRemoveProcessor(): void
     {
         $employee = $this->buildEmployeeWithId(45);