From a905c6a1dede586cc7897e2746d2bba08c3ebc86 Mon Sep 17 00:00:00 2001
From: tristan <tristan@yuno.malio.fr>
Date: Wed, 18 Mar 2026 14:47:03 +0100
Subject: [PATCH] fix : correction des retours de la V0

---
 .claude/settings.local.json                   |   7 +
 .idea/workspace.xml                           |  92 +++-
 CLAUDE.md                                     |  45 +-
 frontend/assets/css/main.css                  |  14 +
 frontend/components/address.vue               |  17 +-
 frontend/components/commun/update-weight.vue  |   3 +
 .../reception/reception-bovine-received.vue   |  21 +-
 .../components/reception/reception-form.vue   | 388 +++--------------
 .../reception/reception-product-received.vue  |  58 ++-
 .../components/reception/reception-weight.vue |  95 -----
 .../reception/update-merchandise.vue          |  42 +-
 .../components/shipment/shipment-form.vue     | 399 ++++--------------
 .../components/shipment/shipment-weight.vue   |  95 -----
 .../components/ui/license-plate-input.vue     |   5 +-
 .../workflow/workflow-liot-fields.vue         |  57 +++
 .../workflow/workflow-waiting-list.vue        |  72 ++++
 .../components/workflow/workflow-weight.vue   |  78 ++++
 frontend/composables/steps/useWeighingStep.ts |  77 ++++
 frontend/composables/useAddressSync.ts        |  54 +++
 frontend/composables/useFormDataLoading.ts    |  73 ++++
 frontend/composables/useLiotHandling.ts       | 153 +++++++
 frontend/composables/useWeighing.ts           | 169 +++-----
 frontend/composables/useWorkflowSteps.ts      |  83 ++++
 frontend/config/reception.config.ts           |  25 ++
 frontend/config/shipment.config.ts            |  25 ++
 frontend/constants/steps.ts                   |  22 -
 frontend/i18n/locales/fr.json                 |   8 +-
 frontend/pages/admin/bovin/[[id]].vue         |   8 +-
 frontend/pages/admin/carrier/[[id]].vue       |   6 +-
 frontend/pages/admin/customer/[[id]].vue      |  19 +-
 .../pages/admin/customer/customer-list.vue    |  70 +--
 frontend/pages/admin/supplier/[[id]].vue      |  19 +-
 .../pages/admin/supplier/supplier-list.vue    |  66 +--
 frontend/pages/admin/user/[[id]].vue          |   7 +-
 frontend/pages/reception/[[id]].vue           |  98 ++---
 frontend/pages/reception/finish-reception.vue |  17 +-
 frontend/pages/reception/update/[[id]].vue    | 110 ++++-
 .../pages/reception/waiting-reception.vue     |  89 ++--
 frontend/pages/shipment/[[id]].vue            |  87 ++--
 frontend/pages/shipment/update/[[id]].vue     |  46 +-
 frontend/pages/shipment/waiting-shipment.vue  | 110 ++---
 frontend/services/address.ts                  |   3 +-
 frontend/services/dto/address-data.ts         |   4 +-
 frontend/services/dto/customer-data.ts        |   2 +
 frontend/services/dto/supplier-data.ts        |   2 +
 frontend/services/reception.ts                |  54 +--
 frontend/services/shipment.ts                 |  54 +--
 frontend/services/weight.ts                   |  27 +-
 frontend/services/workflow-service.ts         |  55 +++
 frontend/stores/reception.ts                  |  66 +--
 frontend/stores/shipment.ts                   |  67 +--
 frontend/stores/workflow-store.ts             |  59 +++
 frontend/types/workflow.ts                    |  48 +++
 migrations/Version20260318103644.php          |  33 ++
 migrations/Version20260318104205.php          |  41 ++
 src/Command/SeedCommand.php                   |  30 +-
 src/DataFixtures/ReferenceFixtures.php        |  33 +-
 src/Entity/Address.php                        |  10 +-
 src/Entity/Carrier.php                        |   2 +-
 src/Entity/Customer.php                       |  19 +-
 src/Entity/Reception.php                      |  27 +-
 src/Entity/Shipment.php                       |  31 +-
 src/Entity/Supplier.php                       |  19 +-
 src/Entity/User.php                           |   4 +-
 64 files changed, 1979 insertions(+), 1640 deletions(-)
 create mode 100644 .claude/settings.local.json
 delete mode 100644 frontend/components/reception/reception-weight.vue
 delete mode 100644 frontend/components/shipment/shipment-weight.vue
 create mode 100644 frontend/components/workflow/workflow-liot-fields.vue
 create mode 100644 frontend/components/workflow/workflow-waiting-list.vue
 create mode 100644 frontend/components/workflow/workflow-weight.vue
 create mode 100644 frontend/composables/steps/useWeighingStep.ts
 create mode 100644 frontend/composables/useAddressSync.ts
 create mode 100644 frontend/composables/useFormDataLoading.ts
 create mode 100644 frontend/composables/useLiotHandling.ts
 create mode 100644 frontend/composables/useWorkflowSteps.ts
 create mode 100644 frontend/config/reception.config.ts
 create mode 100644 frontend/config/shipment.config.ts
 delete mode 100644 frontend/constants/steps.ts
 create mode 100644 frontend/services/workflow-service.ts
 create mode 100644 frontend/stores/workflow-store.ts
 create mode 100644 frontend/types/workflow.ts
 create mode 100644 migrations/Version20260318103644.php
 create mode 100644 migrations/Version20260318104205.php

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
new file mode 100644
index 0000000..47b3190
--- /dev/null
+++ b/.claude/settings.local.json
@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm run:*)"
+    ]
+  }
+}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 75b83ee..084e866 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,17 +4,71 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : ajout de bâtiment dans les fixtures et seed + organisation du menu">
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : correction des retours de la V0">
+      <change afterPath="$PROJECT_DIR$/.claude/settings.local.json" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/components/workflow/workflow-liot-fields.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/components/workflow/workflow-waiting-list.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/components/workflow/workflow-weight.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/composables/steps/useWeighingStep.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/composables/useAddressSync.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/composables/useFormDataLoading.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/composables/useLiotHandling.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/composables/useWorkflowSteps.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/config/reception.config.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/config/shipment.config.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/workflow-service.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/stores/workflow-store.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/types/workflow.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/migrations/Version20260318103644.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/migrations/Version20260318104205.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/components/reception/reception-weight.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/reception-weight.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/components/shipment/shipment-loading.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/shipment/shipment-loading.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/components/shipment/shipment-weight.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/shipment/shipment-weight.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/assets/css/main.css" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/assets/css/main.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/components/address.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/address.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/components/commun/update-weight.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/commun/update-weight.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/components/reception/reception-bovine-received.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/reception-bovine-received.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/components/reception/reception-form.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/reception-form.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/components/reception/reception-product-received.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/reception-product-received.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/components/reception/reception-weight.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/components/reception/update-merchandise.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/update-merchandise.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/components/shipment/shipment-form.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/shipment/shipment-form.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/components/shipment/shipment-weight.vue" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/components/ui/license-plate-input.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/ui/license-plate-input.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/frontend/composables/useWeighing.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/composables/useWeighing.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/constants/steps.ts" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/frontend/i18n/locales/fr.json" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/i18n/locales/fr.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/layouts/default.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/layouts/default.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/bovin/[[id]].vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/bovin/[[id]].vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/carrier/[[id]].vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/carrier/[[id]].vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/customer/[[id]].vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/customer/[[id]].vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/customer/customer-list.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/customer/customer-list.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/supplier/[[id]].vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/supplier/[[id]].vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/user/[[id]].vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/user/[[id]].vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/reception/[[id]].vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/reception/[[id]].vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/reception/finish-reception.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/reception/finish-reception.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/reception/update/[[id]].vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/reception/update/[[id]].vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/reception/waiting-reception.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/reception/waiting-reception.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/shipment/[[id]].vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/shipment/[[id]].vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/shipment/update/[[id]].vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/shipment/update/[[id]].vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/shipment/waiting-shipment.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/shipment/waiting-shipment.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/services/address.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/address.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/services/dto/address-data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/dto/address-data.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/services/dto/customer-data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/dto/customer-data.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/services/dto/supplier-data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/dto/supplier-data.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/frontend/services/reception.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/reception.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/frontend/services/shipment.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/shipment.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/services/weight.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/weight.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/stores/reception.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/stores/reception.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/stores/shipment.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/stores/shipment.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Command/SeedCommand.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Command/SeedCommand.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/DataFixtures/ReferenceFixtures.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/DataFixtures/ReferenceFixtures.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Address.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Address.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Carrier.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Carrier.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Customer.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Customer.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Reception.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Reception.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Shipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Shipment.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Supplier.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Supplier.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/User.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -269,11 +323,11 @@
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\components\shipment" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\m-tristan\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\templates" />
       <recent name="C:\Users\autin\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches" />
       <recent name="C:\Users\autin\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches\Ferme_MCD\MCD_DOC" />
-      <recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\frontend\pages\reception" />
     </key>
   </component>
   <component name="SharedIndexes">
@@ -329,15 +383,7 @@
       <workItem from="1773215356754" duration="5754000" />
       <workItem from="1773756072697" duration="5450000" />
       <workItem from="1773766075191" duration="6202000" />
-      <workItem from="1773824491213" duration="1794000" />
-    </task>
-    <task id="LOCAL-00023" summary="feat : Ajout du bundle Monolog pour la gestion des logs">
-      <option name="closed" value="true" />
-      <created>1769075990984</created>
-      <option name="number" value="00023" />
-      <option name="presentableId" value="LOCAL-00023" />
-      <option name="project" value="LOCAL" />
-      <updated>1769075990984</updated>
+      <workItem from="1773824491213" duration="14242000" />
     </task>
     <task id="LOCAL-00024" summary="fix : affiche plus détail dans les logs en recette/prod">
       <option name="closed" value="true" />
@@ -723,7 +769,15 @@
       <option name="project" value="LOCAL" />
       <updated>1773766207721</updated>
     </task>
-    <option name="localTasksCounter" value="72" />
+    <task id="LOCAL-00072" summary="fix : on ne pèse plus automatiquement + fix message de création réception">
+      <option name="closed" value="true" />
+      <created>1773826699115</created>
+      <option name="number" value="00072" />
+      <option name="presentableId" value="LOCAL-00072" />
+      <option name="project" value="LOCAL" />
+      <updated>1773826699115</updated>
+    </task>
+    <option name="localTasksCounter" value="73" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -773,8 +827,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="feat : ajout de commentaire" />
-    <MESSAGE value="fix : correction de l'affichage de l'immatriculation sur une réception en cours + correction css étape 3 d'une réception" />
     <MESSAGE value="feat : ajout de colonne pour les Supplier, Address et modification du numéro de réception" />
     <MESSAGE value="feat : ajout de colonne pour les Supplier, Address. Modification du numéro de réception et ajout de fixtures" />
     <MESSAGE value="feat : mise à jour du bon de réception" />
@@ -798,7 +850,9 @@
     <MESSAGE value="fix : on ne bloque plus le poids max d'une pesée" />
     <MESSAGE value="feat : ajout de supplier dans la feed et fixtures" />
     <MESSAGE value="feat : ajout de bâtiment dans les fixtures et seed + organisation du menu" />
-    <option name="LAST_COMMIT_MESSAGE" value="feat : ajout de bâtiment dans les fixtures et seed + organisation du menu" />
+    <MESSAGE value="fix : on ne pèse plus automatiquement + fix message de création réception" />
+    <MESSAGE value="fix : correction des retours de la V0" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix : correction des retours de la V0" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/CLAUDE.md b/CLAUDE.md
index fbb6785..f1b2667 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -59,10 +59,18 @@ src/
 frontend/
 ├── components/
 │   ├── ui/             # Composants réutilisables, auto-importés avec préfixe Ui (ex: UiLoadingDots)
-│   └── reception/      # Composants métier réception
-├── composables/        # useApi, useWeighing, usePdfPrinter, useAppVersion
+│   ├── reception/      # Composants métier réception
+│   ├── shipment/       # Composants métier expédition
+│   ├── workflow/       # Composants partagés réception/expédition (workflow-weight, workflow-waiting-list, workflow-liot-fields)
+│   └── commun/         # Composants communs (update-weight)
+├── composables/        # useApi, useWeighing, usePdfPrinter, useAppVersion, useLiotHandling, useFormDataLoading, useAddressSync, useWorkflowSteps
+│   └── steps/          # useWeighingStep (logique étape pesée)
+├── config/             # reception.config.ts, shipment.config.ts (WorkflowConfig)
+├── types/              # workflow.ts (interfaces partagées WorkflowEntity, WorkflowConfig, StepDefinition)
 ├── services/           # Couche service avec DTOs typés dans services/dto/
+│   └── workflow-service.ts  # Factory service API (createWorkflowService)
 ├── stores/             # Pinia stores (reception, shipment, auth)
+│   └── workflow-store.ts    # Factory store (useWorkflowStoreLogic)
 ├── pages/              # Pages Nuxt (file-based routing)
 ├── layouts/            # Layout default : max-width 1050px
 ├── i18n/locales/       # Traductions (défaut: fr)
@@ -78,6 +86,7 @@ frontend/
 - `config/reference.php` est auto-généré — ne pas modifier à la main.
 - Endpoints toujours au pluriel (convention API Platform).
 - Ne jamais créer de GET qui crée des ressources : utiliser POST + PATCH.
+- Les noms de `Supplier`, `Customer` et `Carrier` sont automatiquement mis en majuscule via `mb_strtoupper` dans `setName()`.
 
 ## Conventions frontend
 
@@ -89,21 +98,44 @@ frontend/
 - Nav active : `NuxtLink` avec slot `custom`.
 - PDFs : `usePdfPrinter` (receipt réception, rapport poids cases).
 
+### Validation required & erreurs visuelles
+- Les champs `required` utilisent l'attribut HTML natif forwardé via `v-bind="attrs"` dans les composants UI.
+- La bordure rouge n'apparaît qu'après soumission grâce à la classe CSS `submitted` ajoutée sur le `<form>` au clic sur le bouton Valider (`@click="submitted = true"`).
+- Règles CSS globales dans `main.css` : `.submitted :invalid` (bordure + texte rouge), `.submitted :has(:invalid) > label` et `.submitted label:has(:invalid)` (labels rouges).
+- Pour les validations manuelles (checkboxes, radio groups), les messages d'erreur utilisent `invisible` (pas `hidden`) pour garder l'espace réservé et éviter les décalages de layout.
+- Les dates de l'API sont renvoyées au format `Y-m-d H:i` ; les formulaires utilisent `.slice(0, 10)` pour extraire la date seule (compatible `<input type="date">`).
+
+### Workflow réception/expédition (mutualisé)
+- Factory service `createWorkflowService` et factory store `useWorkflowStoreLogic` pour éviter la duplication.
+- Composables partagés : `useLiotHandling` (logique LIOT), `useFormDataLoading` (users, trucks, carriers), `useAddressSync` (sync adresse fournisseur/client).
+- `useWeighing` : une seule fonction paramétrée pour réception et expédition (remplace `useWeighing` + `useWeighingShipment`).
+- Configs workflow dans `config/reception.config.ts` et `config/shipment.config.ts` (étapes, labels pesée, filename PDF).
+- `WorkflowWeight` composant partagé pour les étapes de pesée (remplace `reception-weight.vue` et `shipment-weight.vue`).
+- `WorkflowWaitingList` composant partagé pour les listes en attente, avec support colonnes dynamiques, slot `actions`, et prop `showActions`.
+
 ## Domaine métier clé
 
 ### Réception (pesée pont-bascule)
-- Entité principale `Reception` : `date_reception` (DateTimeImmutable, format `Y-m-d`), `identification_number` (auto `N-BR-####`), `current_step` (défaut 0), `is_valid` (défaut false).
-- `Weight` (1-N avec Reception) : `type` (`gross`/`tare`), `dsd`, `weight`, `weighed_at`.
+- Entité principale `Reception` : `date_reception` (DateTimeImmutable, format lecture `Y-m-d H:i`, écriture `Y-m-d`), `identification_number` (auto `N-BR-####`), `current_step` (défaut 0), `is_valid` (défaut false).
+- `Weight` (1-N avec Reception, cascade remove + orphanRemoval) : `type` (`gross`/`tare`), `dsd`, `weight`, `weighed_at`.
 - Endpoint pesée : `/receptions/weigh` → `PontBasculeReading` (dsd, weight, weighedAt).
+- Endpoint suppression : `DELETE /receptions/{id}` — supprime en cascade weights, pelletBuildings, bovines.
 - Parsing payload pont-bascule : `Service/PontBasculePayloadDecoder.php`.
 - Exception : `PontBasculeException` (messages en français, mappée 500).
 - Store Pinia `reception.ts` = source de vérité pour la réception en cours.
 - UI multi-étapes dans `pages/reception/[[id]].vue` basée sur `currentStep`.
+- `PrePersist` : injecte l'heure courante sur `receptionDate` à la création ; `setReceptionDate` préserve l'heure existante au PATCH.
+
+### Expédition
+- Entité `Shipment` : même pattern que Reception, `shipment_date` (format lecture `Y-m-d H:i`, écriture `Y-m-d`).
+- Endpoint suppression : `DELETE /shipments/{id}`.
+- `PrePersist` : injecte l'heure courante sur `shipmentDate` ; `setShipmentDate` préserve l'heure au PATCH.
 
 ### LIOT (transport)
 - Si carrier code = `LIOT` : afficher sélecteurs driver + vehicle, masquer saisie plaque manuelle.
 - Liste véhicules filtrée par type de camion et transporteur.
 - Le véhicule sélectionné alimente `license_plate`.
+- Logique mutualisée dans `composables/useLiotHandling.ts`.
 
 ### Bovins & infrastructure
 - `Bovine` : `nationalNumber` (unique), `receivedWeight`, `arrivalDate`, `buildingCase` (ManyToOne).
@@ -111,12 +143,13 @@ frontend/
 - Rapport PDF cases : `GET /building_cases/{id}/weights-report` → template Twig, projection depuis `arrivalDate`, gain journalier fixe `1.3 kg/jour`.
 
 ### Données de référence
-- `ReceptionType`, `MerchandiseType`, `PelletType`, `Building`, `Supplier` (avec `Address` via join table), `Truck`, `Carrier`, `Driver`, `Vehicle`.
-- `Address` expose `fullAddress` via getter.
+- `ReceptionType`, `MerchandiseType`, `PelletType`, `Building`, `Supplier` (avec `Address` via join table, `createdBy` → User), `Customer` (avec `Address` via join table, `createdBy` → User), `Truck`, `Carrier`, `Driver`, `Vehicle`.
+- `Address` : champ `label` nullable (déprécié, retiré du front et du `address:write`), expose `fullAddress` via getter. `countryCode` par défaut `FR` côté front.
 
 ### Seed & fixtures
 - Commande `app:seed` : seed infrastructure (statut, building_layout, building_case, building_case_position) puis bovins.
 - Utilise des flush intermédiaires pour que les queries find fonctionnent sur les records fraîchement créés.
+- `upsertAddress` cherche par `street|postalCode` (plus par `label`).
 - Fixtures : `BuildingInfrastructureFixtures` + `BovineFixtures` (via dépendances `AppFixtures`).
 
 ## Environnement
diff --git a/frontend/assets/css/main.css b/frontend/assets/css/main.css
index 1119c1b..8b1addf 100644
--- a/frontend/assets/css/main.css
+++ b/frontend/assets/css/main.css
@@ -7,3 +7,17 @@
     @apply font-sans;
   }
 }
+
+@layer utilities {
+  .submitted :invalid {
+    @apply border-red-500 text-red-500;
+  }
+
+  .submitted :has(:invalid) > label {
+    @apply text-red-500;
+  }
+
+  .submitted label:has(:invalid) {
+    @apply text-red-500;
+  }
+}
diff --git a/frontend/components/address.vue b/frontend/components/address.vue
index bce2fe9..a6ab4c8 100644
--- a/frontend/components/address.vue
+++ b/frontend/components/address.vue
@@ -1,5 +1,5 @@
 <template>
-    <form @submit.prevent="validateForm">
+    <form :class="{ submitted }" @submit.prevent="validateForm">
         <div class="flex items-center mb-11 justify-between relative">
             <div class="flex flex-row absolute -left-[60px] ">
                 <Icon @click="goBack" name="gg:arrow-left-o" size="40" class="cursor-pointer text-primary-500"/>
@@ -10,11 +10,10 @@
         </div>
 
         <div class="grid grid-cols-2 gap-y-16 gap-x-[200px] mb-16">
-            <UiTextInput id="address-label" v-model="form.label" label="Libellé" />
-            <UiTextInput id="address-street" v-model="form.street" label="Rue" />
+            <UiTextInput id="address-street" v-model="form.street" label="Rue" required />
             <UiTextInput id="address-street2" v-model="form.street2" label="Complément" />
-            <UiTextInput id="address-postalCode" v-model="form.postalCode" label="Code postal" />
-            <UiTextInput id="address-city" v-model="form.city" label="Ville" />
+            <UiTextInput id="address-postalCode" v-model="form.postalCode" label="Code postal" required />
+            <UiTextInput id="address-city" v-model="form.city" label="Ville" required />
             <UiTextInput id="address-country" v-model="form.countryCode" label="Pays (code)" />
         </div>
         <div class="flex justify-center items-center">
@@ -22,6 +21,7 @@
             class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
             type="submit"
             :disabled="isLoading"
+            @click="submitted = true"
         >
             Valider
         </UiButton>
@@ -42,14 +42,14 @@ const props = defineProps<{
 }>()
 
 const isLoading = ref(false)
+const submitted = ref(false)
 
 const emptyForm = (): AddressPayload => ({
-    label: "",
     street: "",
     street2: null,
     postalCode: "",
     city: "",
-    countryCode: "",
+    countryCode: "FR",
 })
 
 const form = reactive<AddressPayload>(emptyForm())
@@ -70,12 +70,11 @@ const backPath = computed(() => {
 
 const hydrateForm = (address?: AddressPayload | null) => {
     const data = address ?? emptyForm()
-    form.label = data.label ?? ""
     form.street = data.street ?? ""
     form.street2 = data.street2 ?? null
     form.postalCode = data.postalCode ?? ""
     form.city = data.city ?? ""
-    form.countryCode = data.countryCode ?? ""
+    form.countryCode = data.countryCode || "FR"
 }
 
 watch(
diff --git a/frontend/components/commun/update-weight.vue b/frontend/components/commun/update-weight.vue
index cb9a561..2bdbc56 100644
--- a/frontend/components/commun/update-weight.vue
+++ b/frontend/components/commun/update-weight.vue
@@ -9,12 +9,14 @@
                 :disabled="!isAdmin"
                 :min="0"
                 wrapper-class="flex-col"
+                required
             />
 
             <UiDateInput
                 label="Date de pesée"
                 v-model="localWeight.weighedAt"
                 :disabled="!isAdmin"
+                required
             />
 
             <UiNumberInput
@@ -24,6 +26,7 @@
                 v-model="localWeight.dsd"
                 :disabled="!isAdmin"
                 wrapper-class="flex-col"
+                required
             />
         </div>
     </form>
diff --git a/frontend/components/reception/reception-bovine-received.vue b/frontend/components/reception/reception-bovine-received.vue
index bba1fbe..78317f5 100644
--- a/frontend/components/reception/reception-bovine-received.vue
+++ b/frontend/components/reception/reception-bovine-received.vue
@@ -1,7 +1,9 @@
 <template>
-    <div
+    <form
         v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"
-        class="flex flex-col gap-16">
+        class="flex flex-col gap-16"
+        @submit.prevent="goNext"
+    >
         <h1 class="text-4xl uppercase font-bold text-primary-500">Sélection des races réceptionnées</h1>
         <div
             class="flex flex-row gap-8 items-center w-full">
@@ -31,15 +33,17 @@
                 />
             </div>
         </div>
+        <p class="text-red-500 text-sm" :class="showBovineError ? '' : 'invisible'">
+            Veuillez saisir au moins une race bovine.
+        </p>
         <div class="flex justify-center">
             <UiButton
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
-                @click="goNext"
             >Valider
             </UiButton>
         </div>
-    </div>
+    </form>
 </template>
 <script setup lang="ts">
 import type {BovineTypeData} from "~/services/dto/bovine-type-data";
@@ -58,6 +62,7 @@ const toast = useToast()
 const isLoadingBovineType = ref(false)
 const bovineType = ref<BovineTypeData[]>([])
 const receptionStore = useReceptionStore()
+const showBovineError = ref(false)
 const bovineQuantities = reactive<Record<string, number | null>>({})
 const otherQuantity = ref<number | null>(0)
 const receptionId = computed(() => receptionStore.current?.id ?? null)
@@ -169,7 +174,13 @@ async function goNext() {
         return
     }
 
-    // @TODO Ajouter un composable pour le toaster qui gère les key i18n
+    showBovineError.value = false
+
+    if (totalBovines.value === 0) {
+        showBovineError.value = true
+        return
+    }
+
     if (totalBovines.value > 52) {
         toast.error({
             title: 'Erreur',
diff --git a/frontend/components/reception/reception-form.vue b/frontend/components/reception/reception-form.vue
index 75bb937..3b18621 100644
--- a/frontend/components/reception/reception-form.vue
+++ b/frontend/components/reception/reception-form.vue
@@ -1,8 +1,7 @@
 <template>
-    <form @submit.prevent="validate">
+    <form :class="{ submitted }" @submit.prevent="validate">
         <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
             <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1 text-primary-500">Réception</h1>
-            <!--    Nom de l'utilisateur       -->
             <UiSelect
                 id="reception-user"
                 v-model="form.userId"
@@ -13,15 +12,15 @@
                 }))"
                 :loading="isLoadingUsers"
                 wrapper-class="col-start-1 row-start-2"
+                required
             />
-            <!--    Date de réception        -->
             <UiDateInput
                 id="reception-date"
                 v-model="form.receptionDate"
                 label="Date de réception"
                 wrapper-class="col-start-1 row-start-3"
+                required
             />
-            <!--    Type de réception        -->
             <UiSelect
                 id="reception-type"
                 v-model="form.receptionTypeId"
@@ -31,8 +30,8 @@
                     label: type.label
                 }))"
                 wrapper-class="col-start-1 row-start-4"
+                required
             />
-            <!--    Fournisseur        -->
             <UiSelect
                 id="reception-supplier"
                 v-model="form.supplierId"
@@ -43,20 +42,17 @@
                 }))"
                 :loading="isLoadingSuppliers"
                 wrapper-class="col-start-1 row-start-5"
+                required
             />
-            <!--    Adresse fournisseur        -->
             <UiSelect
                 id="reception-address"
                 v-model="form.addressId"
                 label="Adresse"
-                :options="supplierAddresses.map((address) => ({
-                    value: String(address.id),
-                    label: address.fullAddress
-                }))"
-                :disabled="isLoadingSuppliers || supplierAddresses.length === 0"
+                :options="addressOptions"
+                :disabled="isLoadingSuppliers || ownerAddresses.length === 0"
                 wrapper-class="col-start-2 row-start-1"
+                required
             />
-            <!--    Camion        -->
             <UiSelect
                 id="reception-truck"
                 v-model="form.truckId"
@@ -67,8 +63,8 @@
                 }))"
                 :loading="isLoadingTrucks"
                 wrapper-class="col-start-2 row-start-2"
+                required
             />
-            <!--    Transporteur        -->
             <UiSelect
                 id="reception-carrier"
                 v-model="form.carrierId"
@@ -80,15 +76,15 @@
                 :loading="isLoadingCarriers"
                 select-class="h-[34px]"
                 wrapper-class="col-start-2 row-start-3"
+                required
             />
-            <!--    Plaque d'immatriculation       -->
             <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
                 <UiLicensePlateInput
                     v-model="form.licensePlate"
                     v-model:allowAny="allowAnyLicensePlate"
+                    required
                 />
             </div>
-            <!--    Immatriculation (LIOT)        -->
             <UiSelect
                 v-if="isLiotCarrier"
                 id="reception-vehicle"
@@ -101,8 +97,8 @@
                 :loading="isLoadingVehicles"
                 :disabled="isLoadingVehicles || filteredVehicles.length === 0"
                 wrapper-class="col-start-2 row-start-4 h-[64px]"
+                required
             />
-            <!--    Chauffeur (LIOT)        -->
             <UiSelect
                 id="reception-driver"
                 v-model="form.driverId"
@@ -114,42 +110,38 @@
                 :loading="isLoadingDrivers"
                 v-if="isLiotCarrier"
                 wrapper-class="col-start-2 row-start-5"
+                required
             />
         </div>
         <div class="flex justify-center">
             <UiButton
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
+                @click="submitted = true"
             >Valider
             </UiButton>
         </div>
     </form>
-
 </template>
 
 <script setup lang="ts">
-import {useReceptionStore} from '~/stores/reception'
-import type {ReceptionTypeData} from '~/services/dto/reception-type-data'
-import {getReceptionTypeList} from '~/services/reception-type'
-import type {UserData} from '~/services/dto/user-data'
-import {getUsers} from '~/services/auth'
-import {useAuthStore} from '~/stores/auth'
-import type {SupplierData} from '~/services/dto/supplier-data'
-import {getSupplierList} from '~/services/supplier'
-import type {TruckData} from '~/services/dto/truck-data'
-import {getTruckList} from '~/services/truck'
-import type {CarrierData} from '~/services/dto/carrier-data'
-import {getCarrierList} from '~/services/carrier'
-import type {DriverData} from '~/services/dto/driver-data'
-import {getDriverList} from '~/services/driver'
-import type {VehicleData} from '~/services/dto/vehicle-data'
-import {getVehicleList} from '~/services/vehicle'
-import {RECEPTION_TYPE_CODES, SUPPLIER_CODE} from "~/utils/constants";
-import {deleteReceptionBovine, getReceptionBovineList} from "~/services/reception-bovine";
-import type {ReceptionFormData} from "~/services/dto/reception-data";
+import { useReceptionStore } from '~/stores/reception'
+import { useFormDataLoading } from '~/composables/useFormDataLoading'
+import { useLiotHandling } from '~/composables/useLiotHandling'
+import { useAddressSync } from '~/composables/useAddressSync'
+import type { ReceptionTypeData } from '~/services/dto/reception-type-data'
+import { getReceptionTypeList } from '~/services/reception-type'
+import type { SupplierData } from '~/services/dto/supplier-data'
+import { getSupplierList } from '~/services/supplier'
+import { RECEPTION_TYPE_CODES } from '~/utils/constants'
+import { deleteReceptionBovine, getReceptionBovineList } from '~/services/reception-bovine'
+import type { ReceptionFormData } from '~/services/dto/reception-data'
 
 const router = useRouter()
 const receptionStore = useReceptionStore()
+const isHydrating = ref(false)
+const submitted = ref(false)
+
 const form = reactive<ReceptionFormData>({
     licensePlate: '',
     receptionDate: new Date().toISOString().slice(0, 10),
@@ -162,62 +154,27 @@ const form = reactive<ReceptionFormData>({
     driverId: '',
     vehicleId: ''
 })
-const allowAnyLicensePlate = ref(false)
+
 const receptionTypes = ref<ReceptionTypeData[]>([])
-const users = ref<UserData[]>([])
-const isLoadingUsers = ref(false)
 const suppliers = ref<SupplierData[]>([])
 const isLoadingSuppliers = ref(false)
-const trucks = ref<TruckData[]>([])
-const isLoadingTrucks = ref(false)
-const carriers = ref<CarrierData[]>([])
-const isLoadingCarriers = ref(false)
-const drivers = ref<DriverData[]>([])
-const isLoadingDrivers = ref(false)
-const vehicles = ref<VehicleData[]>([])
-const isLoadingVehicles = ref(false)
-const authStore = useAuthStore()
-// Empêche les watchers de reset des champs pendant le remplissage initial
-const isHydrating = ref(false)
 
-// Transporteur sélectionné dans le formulaire
-const selectedCarrier = computed(() =>
-    carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
-)
-// Indique si le transporteur est LIOT
-const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
-// Adresses disponibles pour le fournisseur sélectionné
-const supplierAddresses = computed(() => {
-    const supplierId = Number(form.supplierId)
-    if (!Number.isFinite(supplierId)) {
-        return []
-    }
-    return suppliers.value.find((supplier) => supplier.id === supplierId)?.addresses ?? []
-})
-// Chauffeurs filtrés par transporteur (LIOT)
-const filteredDrivers = computed<DriverData[]>(() => {
-    if (!form.carrierId) {
-        return []
-    }
-    return drivers.value.filter((driver) => String(driver.carrier?.id) === form.carrierId)
-})
-// Véhicules filtrés par transporteur + type de camion
-const filteredVehicles = computed<VehicleData[]>(() => {
-    if (!form.carrierId) {
-        return []
-    }
-    return vehicles.value.filter(
-        (vehicle) =>
-            String(vehicle.carrier?.id) === form.carrierId &&
-            (!form.truckId || String(vehicle.truck?.id) === form.truckId)
-    )
-})
+const { users, trucks, carriers, isLoadingUsers, isLoadingTrucks, isLoadingCarriers, loadCommonData } =
+    useFormDataLoading(form)
+
+const {
+    isLiotCarrier, filteredDrivers, filteredVehicles,
+    isLoadingDrivers, isLoadingVehicles, allowAnyLicensePlate,
+    loadDrivers, loadVehicles
+} = useLiotHandling(form, carriers, isHydrating)
+
+const supplierIdRef = computed(() => form.supplierId)
+const { ownerAddresses, addressOptions } = useAddressSync(form, supplierIdRef, suppliers)
 
 const selectedReceptionType = computed(() =>
     receptionTypes.value.find((type) => String(type.id) === form.receptionTypeId) ?? null
 )
 
-// Supprime les données bovines si on change de type de réception
 const clearReceptionBovines = async (receptionIri: string) => {
     const existing = await getReceptionBovineList(receptionIri)
     for (const selection of existing) {
@@ -225,50 +182,6 @@ const clearReceptionBovines = async (receptionIri: string) => {
     }
 }
 
-// Hydrate le formulaire depuis la réception en cours
-watch(
-    () => receptionStore.current,
-    (reception) => {
-        isHydrating.value = true
-        form.licensePlate = reception?.licensePlate ?? ''
-        form.receptionDate = reception?.receptionDate ?? new Date().toISOString().slice(0, 10)
-        form.receptionTypeId = reception?.receptionType?.id
-            ? String(reception.receptionType.id)
-            : ''
-        form.userId = reception?.user?.id
-            ? String(reception.user.id)
-            : form.userId
-        form.supplierId = reception?.supplier?.id
-            ? String(reception.supplier.id)
-            : ''
-        form.addressId = reception?.address?.id
-            ? String(reception.address.id)
-            : ''
-        form.truckId = reception?.truck?.id
-            ? String(reception.truck.id)
-            : ''
-        form.carrierId = reception?.carrier?.id
-            ? String(reception.carrier.id)
-            : ''
-        form.driverId = reception?.driver?.id
-            ? String(reception.driver.id)
-            : ''
-        isHydrating.value = false
-    },
-    {immediate: true}
-)
-
-// Charge la liste des users pour le select
-const loadUsers = async () => {
-    isLoadingUsers.value = true
-    try {
-        users.value = await getUsers()
-    } finally {
-        isLoadingUsers.value = false
-    }
-}
-
-// Charge la liste des fournisseurs pour le select
 const loadSuppliers = async () => {
     isLoadingSuppliers.value = true
     try {
@@ -278,185 +191,32 @@ const loadSuppliers = async () => {
     }
 }
 
-// Charge la liste des camions pour le select
-const loadTrucks = async () => {
-    isLoadingTrucks.value = true
-    try {
-        trucks.value = await getTruckList()
-    } finally {
-        isLoadingTrucks.value = false
-    }
-}
+watch(
+    () => receptionStore.current,
+    (reception) => {
+        isHydrating.value = true
+        form.licensePlate = reception?.licensePlate ?? ''
+        form.receptionDate = reception?.receptionDate?.slice(0, 10) ?? new Date().toISOString().slice(0, 10)
+        form.receptionTypeId = reception?.receptionType?.id ? String(reception.receptionType.id) : ''
+        form.userId = reception?.user?.id ? String(reception.user.id) : form.userId
+        form.supplierId = reception?.supplier?.id ? String(reception.supplier.id) : ''
+        form.addressId = reception?.address?.id ? String(reception.address.id) : ''
+        form.truckId = reception?.truck?.id ? String(reception.truck.id) : ''
+        form.carrierId = reception?.carrier?.id ? String(reception.carrier.id) : ''
+        form.driverId = reception?.driver?.id ? String(reception.driver.id) : ''
+        isHydrating.value = false
+    },
+    { immediate: true }
+)
 
-// Charge la liste des transporteurs pour le select
-const loadCarriers = async () => {
-    isLoadingCarriers.value = true
-    try {
-        carriers.value = await getCarrierList()
-    } finally {
-        isLoadingCarriers.value = false
-    }
-}
-
-// Charge la liste des chauffeurs pour le select
-const loadDrivers = async () => {
-    isLoadingDrivers.value = true
-    try {
-        drivers.value = await getDriverList()
-    } finally {
-        isLoadingDrivers.value = false
-    }
-}
-
-// Charge la liste des véhicules pour le select
-const loadVehicles = async () => {
-    isLoadingVehicles.value = true
-    try {
-        vehicles.value = await getVehicleList()
-    } finally {
-        isLoadingVehicles.value = false
-    }
-}
-
-// On met le user connecté par défaut dans le select
-const setDefaultUser = () => {
-    if (form.userId) {
-        return
-    }
-    if (authStore.user?.id) {
-        form.userId = String(authStore.user.id)
-    }
-}
-
-// On récupère toutes les données des selects au chargement du composant
 onMounted(async () => {
     receptionTypes.value = await getReceptionTypeList()
-    await loadUsers()
     await loadSuppliers()
-    await loadTrucks()
-    await loadCarriers()
+    await loadCommonData()
     await loadDrivers()
     await loadVehicles()
-    await authStore.ensureSession()
-    setDefaultUser()
 })
 
-// Ajuste driver/vehicle quand le transporteur change (logique LIOT)
-watch(
-    () => [form.supplierId, form.addressId, suppliers.value],
-    () => {
-        if (!form.supplierId) {
-            form.addressId = ''
-            return
-        }
-        if (!form.addressId && supplierAddresses.value.length === 1) {
-            form.addressId = String(supplierAddresses.value[0].id)
-            return
-        }
-        if (!form.addressId) {
-            return
-        }
-        const matches = supplierAddresses.value.some(
-            (address) => String(address.id) === form.addressId
-        )
-        if (!matches) {
-            if (supplierAddresses.value.length === 1) {
-                form.addressId = String(supplierAddresses.value[0].id)
-            } else {
-                form.addressId = ''
-            }
-        }
-    },
-    {immediate: true}
-)
-
-// Valide/auto-sélectionne le véhicule selon camion + transporteur (LIOT)
-watch(
-    () => form.carrierId,
-    () => {
-        if (isHydrating.value) {
-            return
-        }
-        if (!form.carrierId) {
-            form.driverId = ''
-            form.vehicleId = ''
-            return
-        }
-        if (!isLiotCarrier.value) {
-            form.driverId = ''
-            form.vehicleId = ''
-            return
-        }
-        if (filteredDrivers.value.length === 1) {
-            form.driverId = String(filteredDrivers.value[0].id)
-        }
-        if (filteredVehicles.value.length === 1) {
-            form.vehicleId = String(filteredVehicles.value[0].id)
-        }
-    },
-    {immediate: true}
-)
-
-// Récupère la plaque depuis le véhicule choisi (LIOT)
-watch(
-    () => [form.truckId, form.carrierId, vehicles.value],
-    () => {
-        if (!isLiotCarrier.value) {
-            return
-        }
-        if (filteredVehicles.value.length === 1) {
-            form.vehicleId = String(filteredVehicles.value[0].id)
-            return
-        }
-        if (!form.vehicleId) {
-            return
-        }
-        const matches = filteredVehicles.value.some(
-            (vehicle) => String(vehicle.id) === form.vehicleId
-        )
-        if (!matches) {
-            form.vehicleId = ''
-        }
-    },
-    {immediate: true}
-)
-
-// Auto-renseigne le véhicule si la plaque correspond (LIOT)
-watch(
-    () => [form.vehicleId, form.carrierId, vehicles.value],
-    () => {
-        if (!isLiotCarrier.value) {
-            return
-        }
-        if (isHydrating.value) {
-            return
-        }
-        const selected = filteredVehicles.value.find(
-            (vehicle) => String(vehicle.id) === form.vehicleId
-        )
-        if (selected) {
-            form.licensePlate = selected.plate
-            allowAnyLicensePlate.value = false
-        }
-    }
-)
-
-watch(
-    () => [form.licensePlate, form.carrierId, vehicles.value],
-    () => {
-        if (!isLiotCarrier.value || form.vehicleId) {
-            return
-        }
-        const match = filteredVehicles.value.find(
-            (vehicle) => vehicle.plate === form.licensePlate
-        )
-        if (match) {
-            form.vehicleId = String(match.id)
-        }
-    }
-)
-
-// Valide le formulaire et crée/met à jour la réception
 async function validate() {
     const normalizedLicensePlate = form.licensePlate.trim()
     const normalizedReceptionDate = form.receptionDate.trim()
@@ -467,27 +227,14 @@ async function validate() {
     const normalizedTruckId = form.truckId.trim()
     const normalizedCarrierId = form.carrierId.trim()
     const normalizedDriverId = form.driverId.trim()
-    const receptionTypeIri = normalizedReceptionTypeId
-        ? `/api/reception_types/${normalizedReceptionTypeId}`
-        : null
-    const userIri = normalizedUserId
-        ? `/api/users/${normalizedUserId}`
-        : null
-    const supplierIri = normalizedSupplierId
-        ? `/api/suppliers/${normalizedSupplierId}`
-        : null
-    const addressIri = normalizedAddressId
-        ? `/api/addresses/${normalizedAddressId}`
-        : null
-    const truckIri = normalizedTruckId
-        ? `/api/trucks/${normalizedTruckId}`
-        : null
-    const carrierIri = normalizedCarrierId
-        ? `/api/carriers/${normalizedCarrierId}`
-        : null
-    const driverIri = normalizedDriverId
-        ? `/api/drivers/${normalizedDriverId}`
-        : null
+
+    const receptionTypeIri = normalizedReceptionTypeId ? `/api/reception_types/${normalizedReceptionTypeId}` : null
+    const userIri = normalizedUserId ? `/api/users/${normalizedUserId}` : null
+    const supplierIri = normalizedSupplierId ? `/api/suppliers/${normalizedSupplierId}` : null
+    const addressIri = normalizedAddressId ? `/api/addresses/${normalizedAddressId}` : null
+    const truckIri = normalizedTruckId ? `/api/trucks/${normalizedTruckId}` : null
+    const carrierIri = normalizedCarrierId ? `/api/carriers/${normalizedCarrierId}` : null
+    const driverIri = normalizedDriverId ? `/api/drivers/${normalizedDriverId}` : null
 
     const basePayload = {
         licensePlate: normalizedLicensePlate,
@@ -502,7 +249,7 @@ async function validate() {
 
     const payload = {
         ...basePayload,
-        ...(isLiotCarrier.value && driverIri ? {driver: driverIri} : {})
+        ...(isLiotCarrier.value && driverIri ? { driver: driverIri } : {})
     }
 
     if (!receptionStore.current) {
@@ -532,5 +279,4 @@ async function validate() {
         ...payload
     })
 }
-
 </script>
diff --git a/frontend/components/reception/reception-product-received.vue b/frontend/components/reception/reception-product-received.vue
index caa0ef7..214b934 100644
--- a/frontend/components/reception/reception-product-received.vue
+++ b/frontend/components/reception/reception-product-received.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="flex flex-col items-center gap-16">
+    <form :class="['flex flex-col items-center gap-16', { submitted }]" @submit.prevent="goNext">
         <div
             v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
             class="flex flex-col gap-16 items-center w-full">
@@ -10,6 +10,7 @@
                 label="Type de marchandises"
                 :options="merchandiseTypes.map((type) => ({ value: String(type.id), label: type.label }))"
                 wrapper-class="w-[550px]"
+                required
             />
             <div
                 v-if="selectedMerchandiseTypeId && isAutres"
@@ -21,24 +22,30 @@
                     label="Préciser"
                     placeholder="Précisions complémentaires"
                     :maxlength="255"
+                    required
                 />
             </div>
 
             <div
                 v-if="selectedMerchandiseTypeId && !isGranule"
-                class="flex gap-4 w-[550px] justify-between"
+                class="flex flex-col gap-4 w-[550px]"
             >
-                <div
-                    v-for="building in buildings"
-                    :key="building.id"
-                >
-                    <UiCheckbox
-                        v-model="selectedBuildingIds"
-                        :value="String(building.id)"
-                        :label="building.label"
-                        label-class="text-xl"
-                    />
+                <div class="flex gap-4 justify-between">
+                    <div
+                        v-for="building in buildings"
+                        :key="building.id"
+                    >
+                        <UiCheckbox
+                            v-model="selectedBuildingIds"
+                            :value="String(building.id)"
+                            :label="building.label"
+                            label-class="text-xl"
+                        />
+                    </div>
                 </div>
+                <p class="text-red-500 text-sm" :class="showBuildingError ? '' : 'invisible'">
+                    Veuillez sélectionner au moins un bâtiment.
+                </p>
             </div>
 
             <div
@@ -62,17 +69,20 @@
                         </div>
                     </div>
                 </div>
+                <p class="text-red-500 text-sm" :class="showBuildingError ? '' : 'invisible'">
+                    Veuillez sélectionner au moins un bâtiment.
+                </p>
             </div>
         </div>
         <div class="flex justify-center">
             <UiButton
                 type="submit"
                 class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
-                @click="goNext"
+                @click="submitted = true"
             >Valider
             </UiButton>
         </div>
-    </div>
+    </form>
 </template>
 
 <script setup lang="ts">
@@ -100,6 +110,9 @@ const selectedMerchandiseTypeId = ref('')
 const selectedBuildingIds = ref<string[]>([])
 const selectedPelletBuildingIds = ref<Record<string, string[]>>({})
 const merchandiseDetail = ref('')
+const submitted = ref(false)
+const showBuildingError = ref(false)
+const showPelletBuildingError = ref(false)
 
 // Extrait l'ID d'une relation depuis un IRI ou un objet complet.
 const getRelationId = (value: unknown): string | null => {
@@ -182,6 +195,23 @@ async function goNext() {
         return
     }
 
+    showBuildingError.value = false
+    showPelletBuildingError.value = false
+
+    if (!isGranule.value && !isAutres.value && selectedBuildingIds.value.length === 0) {
+        showBuildingError.value = true
+        return
+    }
+
+    if (isGranule.value) {
+        const hasAnyPelletBuilding = Object.values(selectedPelletBuildingIds.value)
+            .some((ids) => ids.length > 0)
+        if (!hasAnyPelletBuilding) {
+            showPelletBuildingError.value = true
+            return
+        }
+    }
+
     const nextStep = receptionStore.current.currentStep + 1
     const receptionIri = `/api/receptions/${receptionStore.current.id}`
 
diff --git a/frontend/components/reception/reception-weight.vue b/frontend/components/reception/reception-weight.vue
deleted file mode 100644
index 20f2978..0000000
--- a/frontend/components/reception/reception-weight.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-    <div class="flex justify-center">
-        <div class="flex flex-col items-center w-[660px]">
-            <h1 class="font-bold text-5xl uppercase text-primary-500">{{ title }}</h1>
-<!--@TODO Voir comment faire pour savoir si le pont-bascule et bien connecté + ajouter un icon comme sur la maquette-->
-            <p class="text-primary-500 uppercase text-2xl text-primary-500 mt-2">Pont-bascule connecté</p>
-            <div
-                v-if="!displayWeight"
-                class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[86px]">
-                    <UiLoadingDots />
-            </div>
-            <div v-else class="w-full">
-                <div
-                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl text-primary-500">
-                    {{ displayWeight }} kg
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="flex justify-center mt-[54px]">
-        <UiButton
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            @click="fetchWeight"
-        >{{ displayWeight !== null ? 'refaire une pesée' : 'peser' }}</UiButton>
-        <UiButton
-            v-if="displayWeight !== null && !showGenerateReceipt"
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
-            @click="saveWeight"
-        >Valider la pesée</UiButton>
-        <UiButton
-            v-if="showGenerateReceipt"
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
-            @click="printReceipt"
-        >Générer le bon</UiButton>
-    </div>
-</template>
-
-<script setup lang="ts">
-import {computed} from 'vue'
-import { storeToRefs } from 'pinia'
-import { useWeighing } from '~/composables/useWeighing'
-import { usePdfPrinter } from '~/composables/usePdfPrinter'
-import { useReceptionStore } from '~/stores/reception'
-
-const props = defineProps<{
-    mode: 'gross' | 'tare'
-}>()
-
-const router = useRouter()
-const receptionStore = useReceptionStore()
-const { current: storeReception } = storeToRefs(receptionStore)
-const { printPdf } = usePdfPrinter()
-const {
-    displayWeight,
-    title,
-    showLoadingBox,
-    fetchWeight,
-    saveWeight
-} = useWeighing({
-    mode: props.mode,
-    reception: storeReception,
-    updateReception: receptionStore.updateReception,
-    loadReception: receptionStore.loadReception
-})
-// Affiche le bouton de génération du bon à l'étape tare
-const showGenerateReceipt = computed(
-    () => props.mode === 'tare' && displayWeight.value !== null
-)
-
-// Génère le bon de réception, puis clôture la réception
-const printReceipt = async () => {
-    if (!import.meta.client || !receptionStore.current) {
-        return
-    }
-
-    await saveWeight()
-    const reception = receptionStore.current
-    const filename = `${reception.identificationNumber ?? reception.id}_${reception.supplier?.name ?? 'fournisseur'}_${reception.licensePlate ?? 'immat'}.pdf`
-    await printPdf(`/receptions/${reception.id}/receipt`, filename)
-
-    // Laisse le temps a la boite de dialogue d'impression de s'ouvrir.
-    await new Promise((resolve) => setTimeout(resolve, 600))
-
-    const result = await receptionStore.updateReception(receptionStore.current.id, {
-        isValid: true
-    })
-    if (!result) {
-        return
-    }
-
-    receptionStore.clearCurrent()
-    await router.push('/')
-}
-
-</script>
diff --git a/frontend/components/reception/update-merchandise.vue b/frontend/components/reception/update-merchandise.vue
index a5bb79c..1d8c7a3 100644
--- a/frontend/components/reception/update-merchandise.vue
+++ b/frontend/components/reception/update-merchandise.vue
@@ -1,7 +1,7 @@
 <template>
     <form>
         <div class="flex flex-col">
-            <div class="w-full col-start-1 row-start-1">
+            <div class="w-full relative grid grid-cols-[1fr_200px]">
                 <UiRadioGroup
                     id="merchandise-type"
                     v-model="selectedMerchandiseTypeId"
@@ -13,15 +13,25 @@
                     input-class="accent-primary-700 focus:ring-primary-700"
                     option-label-class="uppercase"
                     wrapper-class="w-full uppercase"
-                    group-class="grid grid-cols-[336px_336px_355px_200px] w-[160px_160px_200px_180px] mt-9 mb-7"
+                    group-class="grid grid-cols-4 mt-9 mb-7"
                     :disabled="!isAdmin"
                 />
+                <UiTextInput
+                    v-if="isAutres"
+                    id="merchandise-detail"
+                    :disabled="!isAdmin"
+                    v-model="merchandiseDetail"
+                    placeholder="Préciser"
+                    :maxlength="255"
+                    wrapper-class="w-[200px] mt-12 mb-7"
+                />
             </div>
 
-            <div class="w-full grid grid-cols-[3fr_1fr] gap-12 col-start-2 row-start-1">
-                <div
-                    v-if="selectedMerchandiseTypeId && !isGranule"
-                    class="flex gap-[218px]"
+            <div
+                v-if="selectedMerchandiseTypeId && !isGranule"
+                class="w-full grid grid-cols-[1fr_200px]"
+            >
+                <div class="grid grid-cols-4 gap-6"
                 >
                     <div
                         v-for="building in buildings"
@@ -33,31 +43,17 @@
                             :label="building.label"
                             :disabled="!isAdmin"
                             input-class="accent-primary-700 focus:ring-primary-700"
-                            label-class="text-xl uppercase"
+                            label-class="uppercase"
                         />
                     </div>
                 </div>
-
-                <div
-                    v-if="selectedMerchandiseTypeId && isAutres"
-                    class="flex flex-col justify-self-end max-w-[182px]"
-                >
-                    <UiTextInput
-                        id="merchandise-detail"
-                        :disabled="!isAdmin"
-                        v-model="merchandiseDetail"
-                        placeholder="Préciser"
-                        :maxlength="255"
-                        class="h-6"
-                    />
-                </div>
             </div>
 
             <div
                 v-if="selectedMerchandiseTypeId && isGranule"
-                class="flex flex-col gap-10 w-full col-start-2 row-start-1"
+                class="grid grid-cols-[1fr_200px] w-full col-start-2 row-start-1"
             >
-                <div class="grid grid-cols-1 md:grid-cols-[max-content_max-content_max-content_max-content] justify-between">
+                <div class="grid grid-cols-4 gap-6 justify-between">
                     <div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">
                         <p class="mb-1 font-medium uppercase">{{ type.label }}</p>
                         <div
diff --git a/frontend/components/shipment/shipment-form.vue b/frontend/components/shipment/shipment-form.vue
index 228bae8..093e072 100644
--- a/frontend/components/shipment/shipment-form.vue
+++ b/frontend/components/shipment/shipment-form.vue
@@ -1,8 +1,7 @@
 <template>
-    <form @submit.prevent="validate">
+    <form :class="{ submitted }" @submit.prevent="validate">
         <div class="grid grid-cols-2 h-[461px] items-start gap-y-8 gap-x-40 mb-16">
             <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1 text-primary-500">Expédition</h1>
-            <!--    Nom de l'utilisateur       -->
             <UiSelect
                 id="shipment-user"
                 v-model="form.userId"
@@ -13,15 +12,15 @@
                 }))"
                 :loading="isLoadingUsers"
                 wrapper-class="col-start-1 row-start-2"
+                required
             />
-            <!--    Date de l'éxpedition        -->
             <UiDateInput
                 id="shipment-date"
                 v-model="form.shipmentDate"
                 label="Date du jour"
                 wrapper-class="col-start-1 row-start-3"
+                required
             />
-            <!--    Type d'expédition        -->
             <div class="col-start-1 row-start-4 h-[64px]">
                 <div class="flex w-full items-end gap-[104px]">
                     <UiRadioGroup
@@ -36,6 +35,7 @@
                             value: String(type.id),
                             label: type.label
                         }))"
+                        required
                     />
                     <UiNumberInput
                         id="shipment-type-quantity"
@@ -47,7 +47,6 @@
                     />
                 </div>
             </div>
-            <!--    Client        -->
             <UiSelect
                 id="shipment-customer"
                 v-model="form.customerId"
@@ -58,17 +57,17 @@
                 }))"
                 :loading="isLoadingCustomers"
                 wrapper-class="col-start-1 row-start-5"
+                required
             />
-            <!--    Adresse du client        -->
             <UiSelect
                 id="shipment-address"
                 v-model="form.addressId"
-                :options="customerAddressOptions"
-                :disabled="isLoadingCustomers || customerAddresses.length === 0"
+                :options="addressOptions"
+                :disabled="isLoadingCustomers || ownerAddresses.length === 0"
                 label="Adresse"
                 wrapper-class="col-start-2 row-start-1"
+                required
             />
-            <!--   Camion        -->
             <UiSelect
                 id="shipment-truck"
                 v-model="form.truckId"
@@ -79,8 +78,8 @@
                 }))"
                 :loading="isLoadingTrucks"
                 wrapper-class="col-start-2 row-start-2"
+                required
             />
-            <!--   Transporteur        -->
             <UiSelect
                 id="shipment-carrier"
                 v-model="form.carrierId"
@@ -90,15 +89,15 @@
                     label: carrier.name
                 }))"
                 wrapper-class="col-start-2 row-start-3"
+                required
             />
-            <!-- Plaque d'immatriculation (hors LIOT)        -->
             <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
                 <UiLicensePlateInput
                     v-model="form.licensePlate"
                     v-model:allowAny="allowAnyLicensePlate"
+                    required
                 />
             </div>
-            <!--    Immatriculation (LIOT)        -->
             <UiSelect
                 v-if="isLiotCarrier"
                 id="shipment-vehicle"
@@ -111,8 +110,8 @@
                 :loading="isLoadingVehicles"
                 :disabled="isLoadingVehicles || filteredVehicles.length === 0"
                 wrapper-class="col-start-2 row-start-4"
+                required
             />
-            <!--  Chauffeur (LIOT)        -->
             <UiSelect
                 id="shipment-driver"
                 v-model="form.driverId"
@@ -124,67 +123,35 @@
                 :loading="isLoadingDrivers"
                 wrapper-class="col-start-2 row-start-5"
                 v-if="isLiotCarrier"
+                required
             />
         </div>
         <div class="flex justify-center">
             <UiButton
                 type="submit"
                 class="text-xl mb-16 uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
+                @click="submitted = true"
             >Valider
             </UiButton>
         </div>
     </form>
 </template>
+
 <script setup lang="ts">
+import { useFormDataLoading } from '~/composables/useFormDataLoading'
+import { useLiotHandling } from '~/composables/useLiotHandling'
+import { useAddressSync } from '~/composables/useAddressSync'
+import type { CustomerData } from '~/services/dto/customer-data'
+import { getCustomerList } from '~/services/customer'
+import type { ShipmentFormData } from '~/services/dto/shipment-data'
+import { useShipmentStore } from '~/stores/shipment'
+import type { ShipmentTypeData } from '~/services/dto/shipment-type-data'
+import { getShipmentTypeList } from '~/services/shipment-type'
 
-import type {UserData} from '~/services/dto/user-data'
-import type {CustomerData} from '~/services/dto/customer-data'
-import type {TruckData} from '~/services/dto/truck-data'
-import type {CarrierData} from '~/services/dto/carrier-data'
-import type {DriverData} from '~/services/dto/driver-data'
-import type {VehicleData} from '~/services/dto/vehicle-data'
-import type {AddressData} from '~/services/dto/address-data'
-import {getUsers} from '~/services/auth'
-import {getCustomerList} from '~/services/customer'
-import {getTruckList} from '~/services/truck'
-import {getCarrierList} from '~/services/carrier'
-import {getVehicleList} from '~/services/vehicle'
-import {getDriverList} from '~/services/driver'
-import type {ShipmentFormData} from '~/services/dto/shipment-data'
-import {SUPPLIER_CODE} from "~/utils/constants"
-import {useAuthStore} from '~/stores/auth'
-import {useShipmentStore} from '~/stores/shipment'
-import {computed, reactive, ref, watch, onMounted} from 'vue'
-import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
-import {getShipmentTypeList} from "~/services/shipment-type";
-
-const users = ref<UserData[]>([])
-const customers = ref<CustomerData[]>([])
-const trucks = ref<TruckData[]>([])
-const carriers = ref<CarrierData[]>([])
-const drivers = ref<DriverData[]>([])
-const vehicles = ref<VehicleData[]>([])
-
-const isLoadingUsers = ref(false)
-const isLoadingShipmentTypes = ref(false)
-const isLoadingCustomers = ref(false)
-const isLoadingTrucks = ref(false)
-const isLoadingCarriers = ref(false)
-const isHydrating = ref(false)
-const isLoadingVehicles = ref(false)
-const allowAnyLicensePlate = ref(false)
-const isLoadingDrivers = ref(false)
-const authStore = useAuthStore()
-const shipmentStore = useShipmentStore()
 const router = useRouter()
-const bovineShipment = ref<ShipmentTypeData[]>([])
-const selectedShipmentTypeId = ref('')
-const shipmentQuantity = ref<number | null>(0)
-// Transporteur sélectionné dans le formulaire
-const selectedCarrier = computed(() =>
-    carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
-)
-const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
+const shipmentStore = useShipmentStore()
+const isHydrating = ref(false)
+const submitted = ref(false)
 
 const form = reactive<ShipmentFormData>({
     userId: '',
@@ -197,58 +164,24 @@ const form = reactive<ShipmentFormData>({
     vehicleId: '',
     licensePlate: '',
 })
-// Adresses liées au client sélectionné
-const customerAddresses = computed<AddressData[]>(() => {
-    const customerId = Number(form.customerId)
-    if (!Number.isFinite(customerId)) {
-        return []
-    }
-    return customers.value.find((customer) => customer.id === customerId)?.addresses ?? []
-})
-// Options pour le select des adresses du client
-const customerAddressOptions = computed(() =>
-    customerAddresses.value
-        .map((address) => ({
-            value: String(address.id),
-            label: address.fullAddress
-        }))
-)
-// Chauffeurs liés au transporteur sélectionné (LIOT)
-const filteredDrivers = computed<DriverData[]>(() => {
-    if (!form.carrierId) {
-        return []
-    }
-    return drivers.value.filter((driver) => String(driver.carrier?.id) === form.carrierId)
-})
-// Véhicules liés au transporteur + camion sélectionnés (LIOT)
-const filteredVehicles = computed<VehicleData[]>(() => {
-    if (!form.carrierId) {
-        return []
-    }
-    return vehicles.value.filter(
-        (vehicle) =>
-            String(vehicle.carrier?.id) === form.carrierId &&
-            (!form.truckId || String(vehicle.truck?.id) === form.truckId)
-    )
-})
-// Chargement des données pour les selects
-const loadUsers = async () => {
-    isLoadingUsers.value = true
-    try {
-        users.value = await getUsers()
-    } finally {
-        isLoadingUsers.value = false
-    }
-}
 
-const loadShipmentType = async () => {
-    isLoadingShipmentTypes.value = true
-    try {
-        bovineShipment.value = await getShipmentTypeList()
-    } finally {
-        isLoadingShipmentTypes.value = false
-    }
-}
+const customers = ref<CustomerData[]>([])
+const isLoadingCustomers = ref(false)
+const bovineShipment = ref<ShipmentTypeData[]>([])
+const selectedShipmentTypeId = ref('')
+const shipmentQuantity = ref<number | null>(0)
+
+const { users, trucks, carriers, isLoadingUsers, isLoadingTrucks, isLoadingCarriers, loadCommonData } =
+    useFormDataLoading(form)
+
+const {
+    isLiotCarrier, filteredDrivers, filteredVehicles,
+    isLoadingDrivers, isLoadingVehicles, allowAnyLicensePlate,
+    loadDrivers, loadVehicles
+} = useLiotHandling(form, carriers, isHydrating)
+
+const customerIdRef = computed(() => form.customerId)
+const { ownerAddresses, addressOptions } = useAddressSync(form, customerIdRef, customers)
 
 const loadCustomers = async () => {
     isLoadingCustomers.value = true
@@ -257,212 +190,51 @@ const loadCustomers = async () => {
     } finally {
         isLoadingCustomers.value = false
     }
+}
 
-}
-const loadTrucks = async () => {
-    isLoadingTrucks.value = true
-    try {
-        trucks.value = await getTruckList()
-    } finally {
-        isLoadingTrucks.value = false
-    }
-}
-const loadCarriers = async () => {
-    isLoadingCarriers.value = true
-    try {
-        carriers.value = await getCarrierList()
-    } finally {
-        isLoadingCarriers.value = false
-    }
-}
-const loadVehicles = async () => {
-    isLoadingVehicles.value = true
-    try {
-        vehicles.value = await getVehicleList()
-    } finally {
-        isLoadingVehicles.value = false
-    }
-}
-const loadDrivers = async () => {
-    isLoadingDrivers.value = true
-    try {
-        drivers.value = await getDriverList()
-    } finally {
-        isLoadingDrivers.value = false
-    }
-}
-// On met le user connecté par défaut dans le select
-const setDefaultUser = () => {
-    if (form.userId) {
-        return
-    }
-    if (authStore.user?.id) {
-        form.userId = String(authStore.user.id)
-    }
-}
-// Chargement initial des données
-onMounted(async () => {
-    await loadShipmentType()
-    await loadUsers()
-    await loadCustomers()
-    await loadTrucks()
-    await loadCarriers()
-    await loadVehicles()
-    await loadDrivers()
-    await authStore.ensureSession()
-    setDefaultUser()
-})
-// Hydrate le formulaire depuis l'expédition en cours
 watch(
     () => shipmentStore.current,
     (shipment) => {
         isHydrating.value = true
         form.licensePlate = shipment?.licensePlate ?? ''
-        form.shipmentDate = shipment?.shipmentDate ?? new Date().toISOString().slice(0, 10)
-        form.userId = shipment?.user?.id ? String(shipment.user.id) :
-            form.userId
-        form.customerId = shipment?.customer?.id ?
-            String(shipment.customer.id) : ''
+        form.shipmentDate = shipment?.shipmentDate?.slice(0, 10) ?? new Date().toISOString().slice(0, 10)
+        form.userId = shipment?.user?.id ? String(shipment.user.id) : form.userId
+        form.customerId = shipment?.customer?.id ? String(shipment.customer.id) : ''
         form.addressId = shipment?.address?.id ? String(shipment.address.id) : ''
         form.truckId = shipment?.truck?.id ? String(shipment.truck.id) : ''
         form.carrierId = shipment?.carrier?.id ? String(shipment.carrier.id) : ''
         form.driverId = shipment?.driver?.id ? String(shipment.driver.id) : ''
         form.vehicleId = shipment?.vehicle?.id ? String(shipment.vehicle.id) : ''
-
-
-        selectedShipmentTypeId.value = shipment?.shipmentType?.id
-            ? String(shipment.shipmentType.id)
-            : ''
-
+        selectedShipmentTypeId.value = shipment?.shipmentType?.id ? String(shipment.shipmentType.id) : ''
         shipmentQuantity.value = shipment?.nbBovinSend ?? 0
-
-
         isHydrating.value = false
     },
-    {immediate: true}
-)
-// Ajuste driver/vehicle quand le transporteur change (logique LIOT)
-watch(
-    () => [form.customerId, form.addressId, customers.value],
-    () => {
-        if (!form.customerId) {
-            form.addressId = ''
-            return
-        }
-        if (!form.addressId && customerAddresses.value.length === 1) {
-            form.addressId = String(customerAddresses.value[0].id)
-            return
-        }
-        if (!form.addressId) {
-            return
-        }
-        const matches = customerAddresses.value.some(
-            (address) => String(address.id) === form.addressId
-        )
-        if (!matches) {
-            if (customerAddresses.value.length === 1) {
-                form.addressId = String(customerAddresses.value[0].id)
-            } else {
-                form.addressId = ''
-            }
-        }
-    },
-    {immediate: true}
-)
-// Valide/auto-sélectionne le véhicule selon camion + transporteur (LIOT)
-const applyLiotDefaults = () => {
-    if (isHydrating.value) {
-        return
-    }
-    if (!form.carrierId) {
-        form.driverId = ''
-        form.vehicleId = ''
-        return
-    }
-    if (!isLiotCarrier.value) {
-        form.driverId = ''
-        form.vehicleId = ''
-        return
-    }
-    if (filteredDrivers.value.length === 1) {
-        form.driverId = String(filteredDrivers.value[0].id)
-    }
-    if (filteredVehicles.value.length === 1) {
-        form.vehicleId = String(filteredVehicles.value[0].id)
-    }
-}
-watch(
-    () => form.carrierId,
-    () => {
-        applyLiotDefaults()
-    },
-    {immediate: true}
+    { immediate: true }
 )
+
+// Extra watcher for LIOT defaults after hydration
 watch(
     () => isHydrating.value,
     (value) => {
-        if (!value) {
-            applyLiotDefaults()
-        }
-    }
-)
-// Récupère la plaque depuis le véhicule choisi (LIOT)
-watch(
-    () => [form.truckId, form.carrierId, vehicles.value],
-    () => {
-        if (!isLiotCarrier.value) {
-            return
-        }
-        if (filteredVehicles.value.length === 1) {
-            form.vehicleId = String(filteredVehicles.value[0].id)
-            return
-        }
-        if (!form.vehicleId) {
-            return
-        }
-        const matches = filteredVehicles.value.some(
-            (vehicle) => String(vehicle.id) === form.vehicleId
-        )
-        if (!matches) {
-            form.vehicleId = ''
-        }
-    },
-    {immediate: true}
-)
-// Auto-renseigne le véhicule si la plaque correspond (LIOT)
-watch(
-    () => [form.vehicleId, form.carrierId, vehicles.value],
-    () => {
-        if (!isLiotCarrier.value) {
-            return
-        }
-        if (isHydrating.value) {
-            return
-        }
-        const selected = filteredVehicles.value.find(
-            (vehicle) => String(vehicle.id) === form.vehicleId
-        )
-        if (selected) {
-            form.licensePlate = selected.plate
-            allowAnyLicensePlate.value = false
-        }
-    }
-)
-watch(
-    () => [form.licensePlate, form.carrierId, form.vehicleId, vehicles.value],
-    () => {
-        if (!isLiotCarrier.value || form.vehicleId) {
-            return
-        }
-        const match = filteredVehicles.value.find(
-            (vehicle) => vehicle.plate === form.licensePlate
-        )
-        if (match) {
-            form.vehicleId = String(match.id)
+        if (!value && isLiotCarrier.value) {
+            if (filteredDrivers.value.length === 1 && !form.driverId) {
+                form.driverId = String(filteredDrivers.value[0].id)
+            }
+            if (filteredVehicles.value.length === 1 && !form.vehicleId) {
+                form.vehicleId = String(filteredVehicles.value[0].id)
+            }
         }
     }
 )
 
+onMounted(async () => {
+    bovineShipment.value = await getShipmentTypeList()
+    await loadCustomers()
+    await loadCommonData()
+    await loadVehicles()
+    await loadDrivers()
+})
+
 const buildPayload = () => {
     const normalizedLicensePlate = form.licensePlate.trim()
     const normalizedShipmentDate = form.shipmentDate.trim()
@@ -472,32 +244,18 @@ const buildPayload = () => {
     const normalizedDriverId = form.driverId.trim()
     const normalizedUserId = form.userId.trim()
     const normalizedAddressId = form.addressId.trim()
-    const customerIri = normalizedCustomerId
-        ? `/api/customers/${normalizedCustomerId}`
-        : null
-    const truckIri = normalizedTruckId
-        ? `/api/trucks/${normalizedTruckId}`
-        : null
-    const carrierIri = normalizedCarrierId
-        ? `/api/carriers/${normalizedCarrierId}`
-        : null
-    const userIri = normalizedUserId
-        ? `/api/users/${normalizedUserId}`
-        : null
-    const driverIri = normalizedDriverId
-        ? `/api/drivers/${normalizedDriverId}`
-        : null
-    const addressIri = normalizedAddressId
-        ? `/api/addresses/${normalizedAddressId}`
-        : null
+
+    const customerIri = normalizedCustomerId ? `/api/customers/${normalizedCustomerId}` : null
+    const truckIri = normalizedTruckId ? `/api/trucks/${normalizedTruckId}` : null
+    const carrierIri = normalizedCarrierId ? `/api/carriers/${normalizedCarrierId}` : null
+    const userIri = normalizedUserId ? `/api/users/${normalizedUserId}` : null
+    const driverIri = normalizedDriverId ? `/api/drivers/${normalizedDriverId}` : null
+    const addressIri = normalizedAddressId ? `/api/addresses/${normalizedAddressId}` : null
     const normalizedShipmentTypeId = selectedShipmentTypeId.value.trim()
-    const shipmentTypeIri = normalizedShipmentTypeId
-        ? `/api/shipment_types/${normalizedShipmentTypeId}`
-        : null
+    const shipmentTypeIri = normalizedShipmentTypeId ? `/api/shipment_types/${normalizedShipmentTypeId}` : null
 
     const rawQuantity = Number(shipmentQuantity.value ?? 0)
-    const normalizedQuantity = Number.isFinite(rawQuantity) ? Math.max(0,
-        Math.trunc(rawQuantity)) : 0
+    const normalizedQuantity = Number.isFinite(rawQuantity) ? Math.max(0, Math.trunc(rawQuantity)) : 0
 
     return {
         licensePlate: normalizedLicensePlate,
@@ -522,15 +280,14 @@ const saveDraft = async () => {
         })
         return
     }
-
     await shipmentStore.updateShipment(shipmentStore.current.id, {
         currentStep: shipmentStore.current.currentStep,
         ...payload
     })
 }
 
-defineExpose({saveDraft})
-// Valide le formulaire et crée/met à jour l'expédition
+defineExpose({ saveDraft })
+
 const validate = async () => {
     const payload = buildPayload()
     if (!shipmentStore.current) {
diff --git a/frontend/components/shipment/shipment-weight.vue b/frontend/components/shipment/shipment-weight.vue
deleted file mode 100644
index e0856dc..0000000
--- a/frontend/components/shipment/shipment-weight.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-    <div class="flex justify-center">
-        <div class="flex flex-col items-center w-[660px]">
-            <h1 class="font-bold text-5xl uppercase text-primary-500">{{ title }}</h1>
-<!--@TODO Voir comment faire pour savoir si le pont-bascule et bien connecté + ajouter un icon comme sur la maquette-->
-            <p class="text-primary-500 uppercase text-2xl mt-2">Pont-bascule connecté</p>
-            <div
-                v-if="!displayWeight"
-                class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[86px]">
-                    <UiLoadingDots />
-            </div>
-            <div v-else class="w-full">
-                <div
-                    class="w-full flex flex-col items-center justify-center border border-primary-500 h-[90px] mt-12 mb-[86px] text-4xl text-primary-500">
-                    {{ displayWeight }} kg
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="flex justify-center mt-[54px]">
-        <UiButton
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            @click="fetchWeight"
-        >{{ displayWeight !== null ? 'refaire une pesée' : 'peser' }}</UiButton>
-        <UiButton
-            v-if="displayWeight !== null && !showGenerateReceipt"
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
-            @click="saveWeight"
-        >Valider la pesée</UiButton>
-        <UiButton
-            v-if="showGenerateReceipt"
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
-            @click="printReceipt"
-        >Générer le bon</UiButton>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-import { storeToRefs } from 'pinia'
-import { useWeighingShipment } from '~/composables/useWeighing'
-import { usePdfPrinter } from '~/composables/usePdfPrinter'
-import { useShipmentStore } from '~/stores/shipment'
-
-const props = defineProps<{
-    mode: 'gross' | 'tare'
-}>()
-
-const router = useRouter()
-const shipmentStore = useShipmentStore()
-const { current: storeShipment } = storeToRefs(shipmentStore)
-const { printPdf } = usePdfPrinter()
-const {
-    displayWeight,
-    title,
-    showLoadingBox,
-    fetchWeight,
-    saveWeight
-} = useWeighingShipment({
-    modeShipment: props.mode,
-    shipment: storeShipment,
-    updateShipment: shipmentStore.updateShipment,
-    loadShipment: shipmentStore.loadShipment
-})
-// Affiche le bouton de génération du bon à l'étape tare
-const showGenerateReceipt = computed(
-    () => props.mode === 'tare' && displayWeight.value !== null
-)
-
-// Génère le bon d'expédition, puis clôture l'expédition
-const printReceipt = async () => {
-    if (!import.meta.client || !shipmentStore.current) {
-        return
-    }
-
-    await saveWeight()
-    const shipment = shipmentStore.current
-    const filename = `${shipment.identificationNumber ?? shipment.id}_${shipment.customer?.label ?? 'client'}_${shipment.licensePlate ?? 'immat'}.pdf`
-    await printPdf(`/shipments/${shipment.id}/receipt`, filename)
-
-    // Laisse le temps a la boite de dialogue d'impression de s'ouvrir.
-    await new Promise((resolve) => setTimeout(resolve, 600))
-
-    const result = await shipmentStore.updateShipment(shipmentStore.current.id, {
-        isValid: true
-    })
-    if (!result) {
-        return
-    }
-
-    shipmentStore.clearCurrent()
-    await router.push('/')
-}
-
-</script>
diff --git a/frontend/components/ui/license-plate-input.vue b/frontend/components/ui/license-plate-input.vue
index b71bf57..9c62ec7 100644
--- a/frontend/components/ui/license-plate-input.vue
+++ b/frontend/components/ui/license-plate-input.vue
@@ -9,6 +9,7 @@
               type="text"
               :maxlength="maxLength"
               :placeholder="placeholderText"
+              :required="required"
               class="border-b border-black flex-1 min-w-0 text-xl text-primary-500 uppercase h-[36px] py-[6px]"
               @input="handleInput"
           />
@@ -32,12 +33,14 @@ type Props = {
   allowAny?: boolean
   label?: string
   id?: string
+  required?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
   allowAny: false,
   label: 'Immatriculation',
-  id: 'license-plate'
+  id: 'license-plate',
+  required: false
 })
 
 const emit = defineEmits<{
diff --git a/frontend/components/workflow/workflow-liot-fields.vue b/frontend/components/workflow/workflow-liot-fields.vue
new file mode 100644
index 0000000..b07440f
--- /dev/null
+++ b/frontend/components/workflow/workflow-liot-fields.vue
@@ -0,0 +1,57 @@
+<template>
+    <template v-if="!isLiotCarrier">
+        <div :class="wrapperClass">
+            <UiLicensePlateInput
+                v-model="form.licensePlate"
+                v-model:allowAny="allowAnyLicensePlate"
+            />
+        </div>
+    </template>
+    <template v-if="isLiotCarrier">
+        <UiSelect
+            :id="`${idPrefix}-vehicle`"
+            v-model="form.vehicleId"
+            label="Immatriculation"
+            :options="filteredVehicles.map((vehicle) => ({
+                value: String(vehicle.id),
+                label: vehicle.plate
+            }))"
+            :loading="isLoadingVehicles"
+            :disabled="isLoadingVehicles || filteredVehicles.length === 0"
+            :wrapper-class="wrapperClass"
+        />
+        <UiSelect
+            :id="`${idPrefix}-driver`"
+            v-model="form.driverId"
+            label="Nom du chauffeur si LIOT"
+            :options="filteredDrivers.map((driver) => ({
+                value: String(driver.id),
+                label: driver.name
+            }))"
+            :loading="isLoadingDrivers"
+            :wrapper-class="driverWrapperClass"
+        />
+    </template>
+</template>
+
+<script setup lang="ts">
+import type { DriverData } from '~/services/dto/driver-data'
+import type { VehicleData } from '~/services/dto/vehicle-data'
+
+defineProps<{
+    idPrefix: string
+    form: { licensePlate: string; vehicleId: string; driverId: string }
+    isLiotCarrier: boolean
+    allowAnyLicensePlate: boolean
+    filteredVehicles: VehicleData[]
+    filteredDrivers: DriverData[]
+    isLoadingVehicles: boolean
+    isLoadingDrivers: boolean
+    wrapperClass?: string
+    driverWrapperClass?: string
+}>()
+
+defineEmits<{
+    'update:allowAnyLicensePlate': [value: boolean]
+}>()
+</script>
diff --git a/frontend/components/workflow/workflow-waiting-list.vue b/frontend/components/workflow/workflow-waiting-list.vue
new file mode 100644
index 0000000..75fb8d8
--- /dev/null
+++ b/frontend/components/workflow/workflow-waiting-list.vue
@@ -0,0 +1,72 @@
+<template>
+    <div class="flex items-center justify-between">
+        <div class="flex items-center gap-10">
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+            <h1 class="text-3xl font-bold uppercase text-primary-500">{{ title }}</h1>
+        </div>
+    </div>
+
+    <div class="px-[86px]">
+        <div class="mt-6 border border-slate-200 mb-16">
+            <div
+                class="grid gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
+                :style="{ gridTemplateColumns: gridCols }"
+            >
+                <div v-for="col in columns" :key="col.key">{{ col.label }}</div>
+                <div v-if="showActions">Actions</div>
+            </div>
+            <div
+                v-for="item in items"
+                :key="item.id"
+                class="grid gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
+                :style="{ gridTemplateColumns: gridCols }"
+                role="button"
+                tabindex="0"
+                @click="goToItem(item.id)"
+                @keydown.enter="goToItem(item.id)"
+            >
+                <div v-for="col in columns" :key="col.key">
+                    <slot :name="`cell-${col.key}`" :item="item">
+                        {{ getNestedValue(item, col.key) }}
+                    </slot>
+                </div>
+                <div v-if="showActions" @click.stop>
+                    <slot name="actions" :item="item" />
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+interface Column {
+    key: string
+    label: string
+}
+
+const props = withDefaults(defineProps<{
+    title: string
+    columns: Column[]
+    items: any[]
+    routePrefix: string
+    showActions?: boolean
+}>(), {
+    showActions: false
+})
+
+const router = useRouter()
+
+const gridCols = computed(() => {
+    const dataCols = props.columns.map(() => '1fr').join(' ')
+    return props.showActions ? `${dataCols} 60px` : dataCols
+})
+
+const goToItem = (id: number) => {
+    router.push(`${props.routePrefix}/${id}`)
+}
+
+const getNestedValue = (obj: any, path: string): string => {
+    const value = path.split('.').reduce((acc, key) => acc?.[key], obj)
+    return value || '—'
+}
+</script>
diff --git a/frontend/components/workflow/workflow-weight.vue b/frontend/components/workflow/workflow-weight.vue
new file mode 100644
index 0000000..ae3115f
--- /dev/null
+++ b/frontend/components/workflow/workflow-weight.vue
@@ -0,0 +1,78 @@
+<template>
+    <div class="flex justify-center">
+        <div class="flex flex-col items-center w-[660px]">
+            <h1 class="font-bold text-5xl uppercase text-primary-500">{{ title }}</h1>
+            <p class="text-primary-500 uppercase text-2xl mt-2">Pont-bascule connecté</p>
+            <div
+                v-if="!displayWeight"
+                class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[86px]">
+                <UiLoadingDots />
+            </div>
+            <div v-else class="w-full">
+                <div
+                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl text-primary-500">
+                    {{ displayWeight }} kg
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="flex justify-center mt-[54px]">
+        <UiButton
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            @click="fetchWeight"
+        >{{ displayWeight !== null ? 'refaire une pesée' : 'peser' }}</UiButton>
+        <UiButton
+            v-if="displayWeight !== null && !showGenerateReceipt"
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
+            @click="saveWeight"
+        >Valider la pesée</UiButton>
+        <UiButton
+            v-if="showGenerateReceipt"
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
+            @click="printReceipt"
+        >Générer le bon</UiButton>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { toRef } from 'vue'
+import { useWeighingStep } from '~/composables/steps/useWeighingStep'
+import type { WeightData } from '~/services/dto/weight-data'
+
+const props = defineProps<{
+    mode: 'gross' | 'tare'
+    entityName: 'reception' | 'shipment'
+    apiResource: string
+    titleLabel: string
+    isFinal: boolean
+    entity: any
+    getWeightFromScale: () => Promise<WeightData>
+    updateEntity: (id: number, payload: any) => Promise<any>
+    loadEntity: (id: number) => Promise<any>
+    clearEntity: () => void
+    buildReceiptFilename: (entity: any) => string
+}>()
+
+const entityRef = toRef(props, 'entity')
+
+const {
+    displayWeight,
+    title,
+    fetchWeight,
+    saveWeight,
+    showGenerateReceipt,
+    printReceipt
+} = useWeighingStep({
+    mode: props.mode,
+    entity: entityRef,
+    entityName: props.entityName,
+    apiResource: props.apiResource,
+    titleLabel: props.titleLabel,
+    isFinal: props.isFinal,
+    getWeightFromScale: props.getWeightFromScale,
+    updateEntity: props.updateEntity,
+    loadEntity: props.loadEntity,
+    clearEntity: props.clearEntity,
+    buildReceiptFilename: props.buildReceiptFilename
+})
+</script>
diff --git a/frontend/composables/steps/useWeighingStep.ts b/frontend/composables/steps/useWeighingStep.ts
new file mode 100644
index 0000000..24c4f0b
--- /dev/null
+++ b/frontend/composables/steps/useWeighingStep.ts
@@ -0,0 +1,77 @@
+import type { Ref } from 'vue'
+import { useWeighing } from '~/composables/useWeighing'
+import { usePdfPrinter } from '~/composables/usePdfPrinter'
+import type { WeightData } from '~/services/dto/weight-data'
+
+interface UseWeighingStepOptions {
+    mode: 'gross' | 'tare'
+    entity: Ref<any>
+    entityName: 'reception' | 'shipment'
+    apiResource: string
+    titleLabel: string
+    isFinal: boolean
+    getWeightFromScale: () => Promise<WeightData>
+    updateEntity: (id: number, payload: any) => Promise<any>
+    loadEntity: (id: number) => Promise<any>
+    clearEntity: () => void
+    buildReceiptFilename: (entity: any) => string
+}
+
+export const useWeighingStep = (options: UseWeighingStepOptions) => {
+    const router = useRouter()
+    const { printPdf } = usePdfPrinter()
+
+    const {
+        weightData,
+        currentWeightEntry,
+        displayWeight,
+        displayDsd,
+        title,
+        showLoadingBox,
+        fetchWeight,
+        saveWeight
+    } = useWeighing({
+        mode: options.mode,
+        entity: options.entity,
+        entityName: options.entityName,
+        apiResource: options.apiResource,
+        titleLabel: options.titleLabel,
+        getWeightFromScale: options.getWeightFromScale,
+        updateEntity: options.updateEntity,
+        loadEntity: options.loadEntity
+    })
+
+    const showGenerateReceipt = computed(
+        () => options.isFinal && displayWeight.value !== null
+    )
+
+    const printReceipt = async () => {
+        if (!import.meta.client || !options.entity.value) return
+
+        await saveWeight()
+        const entity = options.entity.value
+        const filename = options.buildReceiptFilename(entity)
+        await printPdf(`/${options.apiResource}/${entity.id}/receipt`, filename)
+
+        await new Promise((resolve) => setTimeout(resolve, 600))
+
+        const result = await options.updateEntity(entity.id, { isValid: true })
+        if (!result) return
+
+        options.clearEntity()
+        await router.push('/')
+    }
+
+    return {
+        weightData,
+        currentWeightEntry,
+        displayWeight,
+        displayDsd,
+        title,
+        showLoadingBox,
+        fetchWeight,
+        saveWeight,
+        showGenerateReceipt,
+        printReceipt
+    }
+}
diff --git a/frontend/composables/useAddressSync.ts b/frontend/composables/useAddressSync.ts
new file mode 100644
index 0000000..1d11d37
--- /dev/null
+++ b/frontend/composables/useAddressSync.ts
@@ -0,0 +1,54 @@
+import type { Ref } from 'vue'
+import type { AddressData } from '~/services/dto/address-data'
+
+interface AddressOwner {
+    id: number
+    addresses?: AddressData[]
+}
+
+export const useAddressSync = (
+    form: { addressId: string },
+    ownerId: Ref<string>,
+    owners: Ref<AddressOwner[]>
+) => {
+    const ownerAddresses = computed<AddressData[]>(() => {
+        const id = Number(ownerId.value)
+        if (!Number.isFinite(id)) return []
+        return owners.value.find((owner) => owner.id === id)?.addresses ?? []
+    })
+
+    const addressOptions = computed(() =>
+        ownerAddresses.value.map((address) => ({
+            value: String(address.id),
+            label: address.fullAddress
+        }))
+    )
+
+    watch(
+        () => [ownerId.value, form.addressId, owners.value],
+        () => {
+            if (!ownerId.value) {
+                form.addressId = ''
+                return
+            }
+            if (!form.addressId && ownerAddresses.value.length === 1) {
+                form.addressId = String(ownerAddresses.value[0].id)
+                return
+            }
+            if (!form.addressId) return
+            const matches = ownerAddresses.value.some(
+                (address) => String(address.id) === form.addressId
+            )
+            if (!matches) {
+                if (ownerAddresses.value.length === 1) {
+                    form.addressId = String(ownerAddresses.value[0].id)
+                } else {
+                    form.addressId = ''
+                }
+            }
+        },
+        { immediate: true }
+    )
+
+    return { ownerAddresses, addressOptions }
+}
diff --git a/frontend/composables/useFormDataLoading.ts b/frontend/composables/useFormDataLoading.ts
new file mode 100644
index 0000000..6f141e6
--- /dev/null
+++ b/frontend/composables/useFormDataLoading.ts
@@ -0,0 +1,73 @@
+import type { UserData } from '~/services/dto/user-data'
+import type { TruckData } from '~/services/dto/truck-data'
+import type { CarrierData } from '~/services/dto/carrier-data'
+import { getUsers } from '~/services/auth'
+import { getTruckList } from '~/services/truck'
+import { getCarrierList } from '~/services/carrier'
+import { useAuthStore } from '~/stores/auth'
+
+export const useFormDataLoading = (form: { userId: string }) => {
+    const users = ref<UserData[]>([])
+    const trucks = ref<TruckData[]>([])
+    const carriers = ref<CarrierData[]>([])
+    const isLoadingUsers = ref(false)
+    const isLoadingTrucks = ref(false)
+    const isLoadingCarriers = ref(false)
+    const authStore = useAuthStore()
+
+    const loadUsers = async () => {
+        isLoadingUsers.value = true
+        try {
+            users.value = await getUsers()
+        } finally {
+            isLoadingUsers.value = false
+        }
+    }
+
+    const loadTrucks = async () => {
+        isLoadingTrucks.value = true
+        try {
+            trucks.value = await getTruckList()
+        } finally {
+            isLoadingTrucks.value = false
+        }
+    }
+
+    const loadCarriers = async () => {
+        isLoadingCarriers.value = true
+        try {
+            carriers.value = await getCarrierList()
+        } finally {
+            isLoadingCarriers.value = false
+        }
+    }
+
+    const setDefaultUser = () => {
+        if (form.userId) return
+        if (authStore.user?.id) {
+            form.userId = String(authStore.user.id)
+        }
+    }
+
+    const loadCommonData = async () => {
+        await loadUsers()
+        await loadTrucks()
+        await loadCarriers()
+        await authStore.ensureSession()
+        setDefaultUser()
+    }
+
+    return {
+        users,
+        trucks,
+        carriers,
+        isLoadingUsers,
+        isLoadingTrucks,
+        isLoadingCarriers,
+        loadUsers,
+        loadTrucks,
+        loadCarriers,
+        setDefaultUser,
+        loadCommonData
+    }
+}
diff --git a/frontend/composables/useLiotHandling.ts b/frontend/composables/useLiotHandling.ts
new file mode 100644
index 0000000..65f8fde
--- /dev/null
+++ b/frontend/composables/useLiotHandling.ts
@@ -0,0 +1,153 @@
+import type { Ref } from 'vue'
+import type { CarrierData } from '~/services/dto/carrier-data'
+import type { DriverData } from '~/services/dto/driver-data'
+import type { VehicleData } from '~/services/dto/vehicle-data'
+import { getDriverList } from '~/services/driver'
+import { getVehicleList } from '~/services/vehicle'
+import { SUPPLIER_CODE } from '~/utils/constants'
+
+interface LiotForm {
+    carrierId: string
+    truckId: string
+    driverId: string
+    vehicleId: string
+    licensePlate: string
+}
+
+export const useLiotHandling = (
+    form: LiotForm,
+    carriers: Ref<CarrierData[]>,
+    isHydrating: Ref<boolean>
+) => {
+    const drivers = ref<DriverData[]>([])
+    const vehicles = ref<VehicleData[]>([])
+    const isLoadingDrivers = ref(false)
+    const isLoadingVehicles = ref(false)
+    const allowAnyLicensePlate = ref(false)
+
+    const selectedCarrier = computed(() =>
+        carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
+    )
+
+    const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
+
+    const filteredDrivers = computed<DriverData[]>(() => {
+        if (!form.carrierId) return []
+        return drivers.value.filter((driver) => String(driver.carrier?.id) === form.carrierId)
+    })
+
+    const filteredVehicles = computed<VehicleData[]>(() => {
+        if (!form.carrierId) return []
+        return vehicles.value.filter(
+            (vehicle) =>
+                String(vehicle.carrier?.id) === form.carrierId &&
+                (!form.truckId || String(vehicle.truck?.id) === form.truckId)
+        )
+    })
+
+    const loadDrivers = async () => {
+        isLoadingDrivers.value = true
+        try {
+            drivers.value = await getDriverList()
+        } finally {
+            isLoadingDrivers.value = false
+        }
+    }
+
+    const loadVehicles = async () => {
+        isLoadingVehicles.value = true
+        try {
+            vehicles.value = await getVehicleList()
+        } finally {
+            isLoadingVehicles.value = false
+        }
+    }
+
+    // Auto-select driver/vehicle when carrier changes
+    watch(
+        () => form.carrierId,
+        () => {
+            if (isHydrating.value) return
+            if (!form.carrierId) {
+                form.driverId = ''
+                form.vehicleId = ''
+                return
+            }
+            if (!isLiotCarrier.value) {
+                form.driverId = ''
+                form.vehicleId = ''
+                return
+            }
+            if (filteredDrivers.value.length === 1) {
+                form.driverId = String(filteredDrivers.value[0].id)
+            }
+            if (filteredVehicles.value.length === 1) {
+                form.vehicleId = String(filteredVehicles.value[0].id)
+            }
+        },
+        { immediate: true }
+    )
+
+    // Validate/auto-select vehicle when truck/carrier changes
+    watch(
+        () => [form.truckId, form.carrierId, vehicles.value],
+        () => {
+            if (!isLiotCarrier.value) return
+            if (filteredVehicles.value.length === 1) {
+                form.vehicleId = String(filteredVehicles.value[0].id)
+                return
+            }
+            if (!form.vehicleId) return
+            const matches = filteredVehicles.value.some(
+                (vehicle) => String(vehicle.id) === form.vehicleId
+            )
+            if (!matches) {
+                form.vehicleId = ''
+            }
+        },
+        { immediate: true }
+    )
+
+    // Sync license plate from selected vehicle
+    watch(
+        () => [form.vehicleId, form.carrierId, vehicles.value],
+        () => {
+            if (!isLiotCarrier.value) return
+            if (isHydrating.value) return
+            const selected = filteredVehicles.value.find(
+                (vehicle) => String(vehicle.id) === form.vehicleId
+            )
+            if (selected) {
+                form.licensePlate = selected.plate
+                allowAnyLicensePlate.value = false
+            }
+        }
+    )
+
+    // Auto-select vehicle from license plate
+    watch(
+        () => [form.licensePlate, form.carrierId, vehicles.value],
+        () => {
+            if (!isLiotCarrier.value || form.vehicleId) return
+            const match = filteredVehicles.value.find(
+                (vehicle) => vehicle.plate === form.licensePlate
+            )
+            if (match) {
+                form.vehicleId = String(match.id)
+            }
+        }
+    )
+
+    return {
+        drivers,
+        vehicles,
+        isLoadingDrivers,
+        isLoadingVehicles,
+        allowAnyLicensePlate,
+        isLiotCarrier,
+        filteredDrivers,
+        filteredVehicles,
+        loadDrivers,
+        loadVehicles
+    }
+}
diff --git a/frontend/composables/useWeighing.ts b/frontend/composables/useWeighing.ts
index 4d3dc8b..bfc22d8 100644
--- a/frontend/composables/useWeighing.ts
+++ b/frontend/composables/useWeighing.ts
@@ -1,54 +1,64 @@
-import {computed, ref} from 'vue'
-import type {WeightEntryData} from '~/services/dto/reception-data'
-import type {WeightData} from '~/services/dto/weight-data'
-import {getWeight} from '~/services/reception'
-import {getWeightShipment} from '~/services/shipment'
-import {createWeight, updateWeight} from '~/services/weight'
-import type {UseWeighingShipmentOptions, UseWeighingOptions} from '~/services/weight'
-import type {WeightShipmentEntryData} from "~/services/dto/shipment-data";
+import { computed, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { WeightEntryData } from '~/services/dto/reception-data'
+import type { WeightData } from '~/services/dto/weight-data'
+import { createWeight, updateWeight } from '~/services/weight'
 
 export type WeighingMode = 'gross' | 'tare'
 
+export interface UseWeighingOptions {
+    mode: WeighingMode
+    entity: Ref<{ id: number; currentStep: number; isValid: boolean; weights?: WeightEntryData[] | null } | null>
+    entityName: 'reception' | 'shipment'
+    apiResource: string
+    titleLabel: string
+    getWeightFromScale: () => Promise<WeightData>
+    updateEntity: (id: number, payload: any) => Promise<any>
+    loadEntity?: (id: number) => Promise<any>
+}
 
 export const useWeighing = ({
-                                mode,
-                                reception,
-                                updateReception,
-                                loadReception
-                            }: UseWeighingOptions) => {
+    mode,
+    entity,
+    entityName,
+    apiResource,
+    titleLabel,
+    getWeightFromScale,
+    updateEntity,
+    loadEntity
+}: UseWeighingOptions) => {
     const weightData = ref<WeightData | null>(null)
     const isFetching = ref(false)
 
     const currentWeightEntry = computed<WeightEntryData | null>(() => {
-        const weights = reception.value?.weights ?? []
+        const weights = entity.value?.weights ?? []
         return weights.find((entry) => entry.type === mode) ?? null
     })
 
     const displayWeight = computed(() => weightData.value?.weight ?? currentWeightEntry.value?.weight ?? null)
     const displayDsd = computed(() => weightData.value?.dsd ?? currentWeightEntry.value?.dsd ?? '-')
-    const title = computed(() => (mode === 'gross' ? 'Pesée à plein' : 'Pesée à vide'))
+    const title = computed(() => titleLabel)
     const showLoadingBox = computed(() => isFetching.value)
 
     const fetchWeight = async () => {
         isFetching.value = true
-        weightData.value = await getWeight().finally(() => {
+        weightData.value = await getWeightFromScale().finally(() => {
             isFetching.value = false
         })
     }
 
     const saveWeight = async () => {
-        if (!reception.value) {
-            return
-        }
+        if (!entity.value) return
 
         const existingEntry = currentWeightEntry.value
         const baseDsd = weightData.value?.dsd ?? existingEntry?.dsd ?? null
         const baseWeight = weightData.value?.weight ?? existingEntry?.weight ?? null
         const baseWeighedAt = weightData.value?.weighedAt ?? existingEntry?.weighedAt ?? null
 
-        if (baseWeight === null) {
-            return
-        }
+        if (baseWeight === null) return
+
+        const relationPayload: Record<string, string> = {}
+        relationPayload[entityName] = `/api/${apiResource}/${entity.value.id}`
 
         if (existingEntry?.id) {
             await updateWeight(existingEntry.id, {
@@ -59,7 +69,7 @@ export const useWeighing = ({
             })
         } else {
             await createWeight({
-                reception: `/api/receptions/${reception.value.id}`,
+                ...relationPayload,
                 type: mode,
                 dsd: baseDsd,
                 weight: baseWeight,
@@ -68,15 +78,15 @@ export const useWeighing = ({
         }
 
         const nextStep = mode === 'tare'
-            ? reception.value.currentStep
-            : reception.value.currentStep + 1
-        await updateReception(reception.value.id, {
+            ? entity.value.currentStep
+            : entity.value.currentStep + 1
+        await updateEntity(entity.value.id, {
             currentStep: nextStep,
-            isValid: reception.value.isValid
+            isValid: entity.value.isValid
         })
 
-        if (loadReception) {
-            await loadReception(reception.value.id)
+        if (loadEntity) {
+            await loadEntity(entity.value.id)
         }
     }
 
@@ -92,84 +102,29 @@ export const useWeighing = ({
     }
 }
 
+// Backward-compatible aliases
 export const useWeighingShipment = ({
-                                        modeShipment,
-                                        shipment,
-                                        updateShipment,
-                                        loadShipment
-                                    }: UseWeighingShipmentOptions) => {
-    const weightData = ref<WeightData | null>(null)
-    const isFetching = ref(false)
-
-    const currentWeightEntry = computed<WeightShipmentEntryData | null>(() => {
-        const weights = shipment.value?.weights ?? []
-        return weights.find((entry) => entry.type === modeShipment) ?? null
+    modeShipment,
+    shipment,
+    updateShipment,
+    loadShipment
+}: {
+    modeShipment: WeighingMode
+    shipment: Ref<any>
+    updateShipment: (id: number, payload: any) => Promise<any>
+    loadShipment?: (id: number) => Promise<any>
+}) => {
+    return useWeighing({
+        mode: modeShipment,
+        entity: shipment,
+        entityName: 'shipment',
+        apiResource: 'shipments',
+        titleLabel: modeShipment === 'gross' ? 'Pesée à vide' : 'Pesée à plein',
+        getWeightFromScale: async () => {
+            const { getWeightShipment } = await import('~/services/shipment')
+            return getWeightShipment()
+        },
+        updateEntity: updateShipment,
+        loadEntity: loadShipment
     })
-
-    const displayWeight = computed(() => weightData.value?.weight ?? currentWeightEntry.value?.weight ?? null)
-    const displayDsd = computed(() => weightData.value?.dsd ?? currentWeightEntry.value?.dsd ?? '-')
-    const title = computed(() => (modeShipment === 'gross' ? 'Pesée à vide' : 'Pesée à plein'))
-    const showLoadingBox = computed(() => isFetching.value)
-
-    const fetchWeight = async () => {
-        isFetching.value = true
-        weightData.value = await getWeightShipment().finally(() => {
-            isFetching.value = false
-        })
-    }
-
-    const saveWeight = async () => {
-        if (!shipment.value) {
-            return
-        }
-
-        const existingEntry = currentWeightEntry.value
-        const baseDsd = weightData.value?.dsd ?? existingEntry?.dsd ?? null
-        const baseWeight = weightData.value?.weight ?? existingEntry?.weight ?? null
-        const baseWeighedAt = weightData.value?.weighedAt ?? existingEntry?.weighedAt ?? null
-
-        if (baseWeight === null) {
-            return
-        }
-
-        if (existingEntry?.id) {
-            await updateWeight(existingEntry.id, {
-                type: modeShipment,
-                dsd: baseDsd,
-                weight: baseWeight,
-                weighedAt: baseWeighedAt
-            })
-        } else {
-            await createWeight({
-                shipment: `/api/shipments/${shipment.value.id}`,
-                type: modeShipment,
-                dsd: baseDsd,
-                weight: baseWeight,
-                weighedAt: baseWeighedAt
-            })
-        }
-
-        const nextStep = modeShipment === 'tare'
-            ? shipment.value.currentStep
-            : shipment.value.currentStep + 1
-        await updateShipment(shipment.value.id, {
-            currentStep: nextStep,
-            isValid: shipment.value.isValid
-        })
-
-        if (loadShipment) {
-            await loadShipment(shipment.value.id)
-        }
-    }
-
-    return {
-        weightData,
-        currentWeightEntry,
-        displayWeight,
-        displayDsd,
-        title,
-        showLoadingBox,
-        fetchWeight,
-        saveWeight
-    }
 }
diff --git a/frontend/composables/useWorkflowSteps.ts b/frontend/composables/useWorkflowSteps.ts
new file mode 100644
index 0000000..dd37886
--- /dev/null
+++ b/frontend/composables/useWorkflowSteps.ts
@@ -0,0 +1,83 @@
+import type { Ref } from 'vue'
+import type { WorkflowConfig } from '~/types/workflow'
+
+interface WorkflowStore {
+    current: any
+    isLoading: boolean
+    clearCurrent: () => void
+    [key: string]: any
+}
+
+export const useWorkflowSteps = (config: WorkflowConfig, store: WorkflowStore) => {
+    const route = useRoute()
+    const router = useRouter()
+
+    const stepLabels = config.steps.map(s => s.label)
+
+    const currentStep = computed(() => store.current?.currentStep ?? 0)
+    const entity = computed(() => store.current)
+
+    const loadMethod = `load${config.entityName.charAt(0).toUpperCase() + config.entityName.slice(1)}`
+    const updateMethod = `update${config.entityName.charAt(0).toUpperCase() + config.entityName.slice(1)}`
+
+    const resolveId = (param: unknown) => {
+        const idStr = Array.isArray(param) ? param[0] : param
+        if (!idStr) return null
+        const id = Number(idStr)
+        return Number.isFinite(id) ? id : null
+    }
+
+    const init = () => {
+        watch(
+            () => route.params.id,
+            async (param) => {
+                const id = resolveId(param)
+                if (id === null) {
+                    store.clearCurrent()
+                    return
+                }
+                await store[loadMethod](id)
+            },
+            { immediate: true }
+        )
+    }
+
+    const saveAndHold = async () => {
+        if (!store.current) {
+            await router.push('/')
+            return
+        }
+        const datePayload: Record<string, any> = {}
+        datePayload[config.dateField] = store.current[config.dateField]
+        await store[updateMethod](store.current.id, {
+            currentStep: store.current.currentStep,
+            licensePlate: store.current.licensePlate,
+            ...datePayload
+        })
+        await router.push('/')
+    }
+
+    const handleStepSelect = async (step: number) => {
+        if (!store.current) return
+        if (step === store.current.currentStep) return
+        await store[updateMethod](store.current.id, { currentStep: step })
+        await store[loadMethod](store.current.id)
+    }
+
+    const advanceStep = async () => {
+        if (!store.current) return
+        const nextStep = store.current.currentStep + 1
+        await store[updateMethod](store.current.id, { currentStep: nextStep })
+        await store[loadMethod](store.current.id)
+    }
+
+    return {
+        stepLabels,
+        currentStep,
+        entity,
+        init,
+        saveAndHold,
+        handleStepSelect,
+        advanceStep
+    }
+}
diff --git a/frontend/config/reception.config.ts b/frontend/config/reception.config.ts
new file mode 100644
index 0000000..8fe4b37
--- /dev/null
+++ b/frontend/config/reception.config.ts
@@ -0,0 +1,25 @@
+import type { WorkflowConfig, WorkflowEntity } from '~/types/workflow'
+
+export const receptionConfig: WorkflowConfig = {
+    entityName: 'reception',
+    apiResource: 'receptions',
+    steps: [
+        { label: 'Réception' },
+        { label: 'Pesée à plein', weighingMode: 'gross' },
+        { label: 'Sélection réception' },
+        { label: 'Pesée à vide', weighingMode: 'tare', isFinal: true }
+    ],
+    weighingLabels: {
+        gross: 'Pesée à plein',
+        tare: 'Pesée à vide'
+    },
+    buildReceiptFilename: (entity: WorkflowEntity) => {
+        const rec = entity as any
+        return `${rec.identificationNumber ?? rec.id}_${rec.supplier?.name ?? 'fournisseur'}_${rec.licensePlate ?? 'immat'}.pdf`
+    },
+    routePrefix: '/reception',
+    toastPrefix: 'reception',
+    dateField: 'receptionDate'
+}
+
+export const RECEPTION_STEP_LABELS = receptionConfig.steps.map(s => s.label)
diff --git a/frontend/config/shipment.config.ts b/frontend/config/shipment.config.ts
new file mode 100644
index 0000000..4244e71
--- /dev/null
+++ b/frontend/config/shipment.config.ts
@@ -0,0 +1,25 @@
+import type { WorkflowConfig, WorkflowEntity } from '~/types/workflow'
+
+export const shipmentConfig: WorkflowConfig = {
+    entityName: 'shipment',
+    apiResource: 'shipments',
+    steps: [
+        { label: 'Expédition' },
+        { label: 'Pesée à vide', weighingMode: 'gross' },
+        { label: 'Chargement' },
+        { label: 'Pesée à plein', weighingMode: 'tare', isFinal: true }
+    ],
+    weighingLabels: {
+        gross: 'Pesée à vide',
+        tare: 'Pesée à plein'
+    },
+    buildReceiptFilename: (entity: WorkflowEntity) => {
+        const ship = entity as any
+        return `${ship.identificationNumber ?? ship.id}_${ship.customer?.label ?? 'client'}_${ship.licensePlate ?? 'immat'}.pdf`
+    },
+    routePrefix: '/shipment',
+    toastPrefix: 'shipment',
+    dateField: 'shipmentDate'
+}
+
+export const SHIPMENT_STEP_LABELS = shipmentConfig.steps.map(s => s.label)
diff --git a/frontend/constants/steps.ts b/frontend/constants/steps.ts
deleted file mode 100644
index a37bcaa..0000000
--- a/frontend/constants/steps.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export enum StepLabel {
-    Reception = 'Réception',
-    GrossWeighing = 'Pesée à plein',
-    Selection = 'Sélection réception',
-    TareWeighing = 'Pesée à vide',
-    Shipment = 'Expédition',
-    ShipmentLoading = 'Chargement',
-}
-
-export const RECEPTION_STEP_LABELS = [
-    StepLabel.Reception,
-    StepLabel.GrossWeighing,
-    StepLabel.Selection,
-    StepLabel.TareWeighing
-]
-
-export const SHIPMENT_STEP_LABELS = [
-    StepLabel.Shipment,
-    StepLabel.TareWeighing,
-    StepLabel.ShipmentLoading,
-    StepLabel.GrossWeighing,
-]
diff --git a/frontend/i18n/locales/fr.json b/frontend/i18n/locales/fr.json
index cb6ac2d..6746614 100644
--- a/frontend/i18n/locales/fr.json
+++ b/frontend/i18n/locales/fr.json
@@ -12,6 +12,7 @@
             "fetch": "Impossible de récupérer la réception.",
             "create": "Impossible de créer la réception.",
             "update": "Impossible de mettre à jour la réception.",
+            "delete": "Impossible de supprimer la réception.",
             "weight": "Impossible de récupérer la pesée."
         },
         "weight": {
@@ -22,6 +23,7 @@
             "fetch": "Impossible de récupérer l'éxpeditions.",
             "create": "Impossible de créer l'éxpeditions.",
             "update": "Impossible de mettre à jour l'éxpeditions.",
+            "delete": "Impossible de supprimer l'expédition.",
             "weigh": "Impossible de récupérer la pesée."
         },
         "shipmentBovine": {
@@ -110,11 +112,13 @@
     "success": {
         "reception": {
             "create": "Réception créée avec succès",
-            "update": "Réception mise à jour avec succès."
+            "update": "Réception mise à jour avec succès.",
+            "delete": "Réception supprimée avec succès."
         },
         "shipment": {
             "create": "Éxpedition créée avec succès",
-            "update": "Éxpedition mise à jour avec succès."
+            "update": "Éxpedition mise à jour avec succès.",
+            "delete": "Expédition supprimée avec succès."
         },
         "supplier": {
             "create": "Fournisseur créé avec succès.",
diff --git a/frontend/pages/admin/bovin/[[id]].vue b/frontend/pages/admin/bovin/[[id]].vue
index 63ab5c9..6b9b94d 100644
--- a/frontend/pages/admin/bovin/[[id]].vue
+++ b/frontend/pages/admin/bovin/[[id]].vue
@@ -1,5 +1,5 @@
 <template>
-    <form @submit.prevent="validate">
+    <form :class="{ submitted }" @submit.prevent="validate">
         <div class="flex items-center justify-between relative">
             <div class="flex flex-row absolute -left-[60px]">
                 <Icon
@@ -15,14 +15,15 @@
         </div>
 
         <div class="grid grid-cols-2 items-start pt-7 mb-11 gap-x-[200px]">
-            <UiTextInput label="Nom du bovin" id="bovin-label" v-model="form.label" />
-            <UiTextInput label="Code bovin" id="code-id" v-model="form.code" />
+            <UiTextInput label="Nom du bovin" id="bovin-label" v-model="form.label" required />
+            <UiTextInput label="Code bovin" id="code-id" v-model="form.code" required />
         </div>
         <div class="flex justify-center items-center">
             <UiButton
                 type="submit"
                 :disabled="isLoading || isHydrating"
                 class="inline-flex items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+                @click="submitted = true"
             >
                 Valider
             </UiButton>
@@ -37,6 +38,7 @@ const router = useRouter()
 const route = useRoute()
 const isLoading = ref(false)
 const isHydrating = ref(false)
+const submitted = ref(false)
 const idBovin = computed(() => resolveId(route.params.id))
 const isEdit = computed(() => idBovin.value !== null)
 
diff --git a/frontend/pages/admin/carrier/[[id]].vue b/frontend/pages/admin/carrier/[[id]].vue
index 257e298..b950f96 100644
--- a/frontend/pages/admin/carrier/[[id]].vue
+++ b/frontend/pages/admin/carrier/[[id]].vue
@@ -1,6 +1,6 @@
 
 <template>
-    <form @submit.prevent="validate">
+    <form :class="{ submitted }" @submit.prevent="validate">
         <div class="flex items-center justify-between relative">
             <div class="flex flex-row absolute -left-[60px]">
                 <Icon
@@ -20,18 +20,21 @@
                 label="Nom du transporteur"
                 id="carrier-name"
                 v-model="form.name"
+                required
             />
 
             <UiTextInput
                 label="Code transporteur"
                 id="code-id"
                 v-model="form.code"
+                required
             />
         </div>
         <div class="flex justify-center items-center">
             <UiButton
                 type="submit"
                 class="inline-flex items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+                @click="submitted = true"
             >
                 Valider
             </UiButton>
@@ -49,6 +52,7 @@ const route = useRoute()
 const idCarrier = computed(() => resolveId(route.params.id))
 const isLoading = ref(false)
 const isHydrating = ref(false)
+const submitted = ref(false)
 
 const resolveId = (param: unknown) => {
     const idStr = Array.isArray(param) ? param[0] : param
diff --git a/frontend/pages/admin/customer/[[id]].vue b/frontend/pages/admin/customer/[[id]].vue
index f51e994..e4c55c9 100644
--- a/frontend/pages/admin/customer/[[id]].vue
+++ b/frontend/pages/admin/customer/[[id]].vue
@@ -1,5 +1,5 @@
 <template>
-    <form @submit.prevent="validate">
+    <form :class="{ submitted }" @submit.prevent="validate">
         <div class="flex items-center relative">
             <div class="flex flex-row absolute -left-[60px] ">
                 <Icon @click="router.push('/admin/customer/customer-list')" name="gg:arrow-left-o" size="40" class="cursor-pointer text-primary-500"/>
@@ -10,8 +10,8 @@
         </div>
 
         <div class="flex flex-cols-3 justify-between mb-11 pt-7">
-            <UiTextInput id="customer-name" v-model="form.name" label="Nom du client" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
-            <UiTextInput id="customer-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
+            <UiTextInput id="customer-name" v-model="form.name" label="Nom du client" :disabled="!auth.isAdmin" wrapper-class="w-[280px]" required/>
+            <UiTextInput id="customer-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin" wrapper-class="w-[280px]" required/>
             <UiTextInput id="customer-email" v-model="form.email" label="Email" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
         </div>
         <div class="flex items-center justify-center">
@@ -19,6 +19,7 @@
                 class="inline-flex mb-28 items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
+                @click="submitted = true"
             >
                 <Icon :name="customerId ? '' : 'mdi:plus'" size="28" />
                 {{ customerId ? "Valider" : "Ajouter" }}
@@ -32,7 +33,6 @@
             <table class="w-full border-collapse text-primary-700">
                 <thead>
                 <tr class="text-left border bg-slate-100 border-gray-200">
-                    <th class="py-3 px-4 text-sm uppercase">Libellé</th>
                     <th class="py-3 px-4 text-sm uppercase">Rue</th>
                     <th class="py-3 px-4 text-sm uppercase">Complément</th>
                     <th class="py-3 px-4 text-sm uppercase">Code postal</th>
@@ -43,7 +43,7 @@
                 <tbody>
                 <template v-if="form.addresses.length === 0">
                     <tr>
-                        <td colspan="6" class="py-4 text-slate-400">
+                        <td colspan="5" class="py-4 text-slate-400">
                             Aucune adresse.
                         </td>
                     </tr>
@@ -56,7 +56,6 @@
                         :class="auth.isAdmin ? 'cursor-pointer' : 'cursor-not-allowed opacity-60'"
                         @click="goToEditAddress(address.id ?? null)"
                     >
-                        <td class="py-3 px-4">{{ address.label || "—" }}</td>
                         <td class="py-3 px-4">{{ address.street || "—" }}</td>
                         <td class="py-3 px-4">{{ address.street2 || "—" }}</td>
                         <td class="py-3 px-4">{{ address.postalCode || "—" }}</td>
@@ -99,6 +98,7 @@ const resolveId = (param: unknown) => {
 }
 const customerId = computed(() => resolveId(route.params.id))
 const isLoading = ref(false)
+const submitted = ref(false)
 const form = reactive<CustomerFormData>({
     name: "",
     phone: "",
@@ -143,7 +143,6 @@ const hydrateFromCustomer = (customer: CustomerData | null) => {
 
     form.addresses = customer.addresses.map((address) => ({
         id: address.id ?? null,
-        label: address.label ?? "",
         street: address.street ?? "",
         street2: address.street2 ?? null,
         postalCode: address.postalCode ?? "",
@@ -188,7 +187,11 @@ async function validate() {
             await updateCustomer(customerId.value, customerPayload)
             targetId = customerId.value
         } else {
-            const created = await createCustomer(customerPayload)
+            const creationPayload = {
+                ...customerPayload,
+                ...(auth.user?.id ? { createdBy: `/api/users/${auth.user.id}` } : {}),
+            }
+            const created = await createCustomer(creationPayload)
             targetId = created.id
         }
 
diff --git a/frontend/pages/admin/customer/customer-list.vue b/frontend/pages/admin/customer/customer-list.vue
index 8805659..32006b2 100644
--- a/frontend/pages/admin/customer/customer-list.vue
+++ b/frontend/pages/admin/customer/customer-list.vue
@@ -6,72 +6,28 @@
     <div v-if="auth.isAdmin" class="mt-7 border border-slate-200 mb-11">
         <div class="max-h-96 overflow-y-auto">
             <div
-                class="sticky text-primary-700 top-0 z-10 grid grid-cols-8 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
+                class="sticky text-primary-700 top-0 z-10 grid grid-cols-4 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
             >
                 <div>Nom</div>
                 <div>Téléphone</div>
-                <div>Email</div>
-                <div>Rue</div>
-                <div>Complément</div>
-                <div>Code Postal</div>
-                <div>Ville</div>
-                <div>Pays</div>
+                <div>Mail</div>
+                <div>Créé par</div>
             </div>
 
             <div v-if="customerList.length === 0" class="px-4 py-6 text-slate-400">
                 Aucun client.
             </div>
 
-            <div v-for="customer in customerList" :key="customer.id">
-                <div
-                    v-if="!customer.addresses || customer.addresses.length === 0"
-                    class="grid text-primary-700 grid-cols-8 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
-                    @click="goToCustomer(customer.id)"
-                >
-                    <div class="truncate">{{ customer.name || "—" }}</div>
-                    <div class="truncate">{{ customer.phone || "—" }}</div>
-                    <div class="truncate">{{ customer.email || "—" }}</div>
-                    <div class="col-span-1">Pas d'adresse</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                </div>
-
-                <template v-else-if="customer.addresses.length > 0">
-                    <div
-                        v-for="(address, idx) in customer.addresses"
-                        :key="address.id ?? `${customer.id}-${idx}-${address.street}-${address.postalCode}`"
-                        class="grid grid-cols-8 text-primary-700 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
-                        :class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
-                        @click="goToCustomer(customer.id)"
-                    >
-                        <div class="truncate">
-                            {{ idx === 0 ? (customer.name || "—") : "↳" }}
-                        </div>
-                        <div class="truncate">{{ idx === 0 ? (customer.phone || "—") : ""  }}</div>
-                        <div class="truncate">{{ idx === 0 ? (customer.email || "—") : ""  }}</div>
-                        <div class="truncate">{{ address.street || "—" }}</div>
-                        <div class="truncate">{{ address.street2 || "—" }}</div>
-                        <div>{{ address.postalCode || "—"  }}</div>
-                        <div class="uppercase truncate">{{ address.city || "—"  }}</div>
-                        <div class="uppercase truncate">{{ address.countryCode || "—" }}</div>
-                    </div>
-                </template>
-
-                <template v-else>
-                    <div
-                        class="grid grid-cols-8 text-primary-700 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
-                        @click="goToCustomer(customer.id)"
-                    >
-                        <div class="truncate">{{ customer.name || "—" }}</div>
-                        <div class="truncate">{{ customer.phone || "—" }}</div>
-                        <div class="truncate">{{ customer.email || "—" }}</div>
-                        <div class="col-span-5 text-slate-400">
-                            Adresses non chargées
-                        </div>
-                    </div>
-                </template>
+            <div
+                v-for="customer in customerList"
+                :key="customer.id"
+                class="grid grid-cols-4 text-primary-700 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                @click="goToCustomer(customer.id)"
+            >
+                <div class="truncate">{{ customer.name || "—" }}</div>
+                <div class="truncate">{{ customer.phone || "—" }}</div>
+                <div class="truncate">{{ customer.email || "—" }}</div>
+                <div class="truncate">{{ customer.createdBy?.username || "—" }}</div>
             </div>
         </div>
     </div>
diff --git a/frontend/pages/admin/supplier/[[id]].vue b/frontend/pages/admin/supplier/[[id]].vue
index abde632..618ae87 100644
--- a/frontend/pages/admin/supplier/[[id]].vue
+++ b/frontend/pages/admin/supplier/[[id]].vue
@@ -1,5 +1,5 @@
 <template>
-    <form @submit.prevent="validate">
+    <form :class="{ submitted }" @submit.prevent="validate">
 
         <div class="flex items-center relative">
             <div class="flex flex-row absolute -left-[60px] ">
@@ -11,15 +11,16 @@
         </div>
 
         <div class="flex flex-cols-3 justify-between mb-11 pt-7">
-            <UiTextInput id="supplier-name" v-model="form.name" label="Nom du fournisseur" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
+            <UiTextInput id="supplier-name" v-model="form.name" label="Nom du fournisseur" :disabled="!auth.isAdmin" wrapper-class="w-[280px]" required/>
+            <UiTextInput id="supplier-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin" wrapper-class="w-[280px]" required/>
             <UiTextInput id="supplier-email" v-model="form.email" label="Email" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
-            <UiTextInput id="supplier-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
         </div>
         <div class="flex items-center justify-center">
             <UiButton
                 class="inline-flex mb-28 items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
                 type="submit"
                 :disabled="isLoading || !auth.isAdmin"
+                @click="submitted = true"
             >
                 <Icon :name="supplierId ? '' : 'mdi:plus'" size="28" />
                 {{ supplierId ? "Valider" : "Ajouter" }}
@@ -33,7 +34,6 @@
             <table class="w-full border-collapse">
                 <thead>
                 <tr class="text-left border bg-slate-100 border-gray-200">
-                    <th class="py-3 px-4 text-sm uppercase">Libellé</th>
                     <th class="py-3 px-4 text-sm uppercase">Rue</th>
                     <th class="py-3 px-4 text-sm uppercase">Complément</th>
                     <th class="py-3 px-4 text-sm uppercase">Code postal</th>
@@ -44,7 +44,7 @@
                 <tbody>
                 <template v-if="form.addresses.length === 0">
                     <tr>
-                        <td colspan="6" class="py-4 text-slate-400">
+                        <td colspan="5" class="py-4 text-slate-400">
                             Aucune adresse.
                         </td>
                     </tr>
@@ -57,7 +57,6 @@
                         :class="auth.isAdmin ? 'cursor-pointer' : 'cursor-not-allowed opacity-60'"
                         @click="goToEditAddress(address.id ?? null)"
                     >
-                        <td class="py-3 px-4">{{ address.label || "—" }}</td>
                         <td class="py-3 px-4">{{ address.street || "—" }}</td>
                         <td class="py-3 px-4">{{ address.street2 || "—" }}</td>
                         <td class="py-3 px-4">{{ address.postalCode || "—" }}</td>
@@ -100,6 +99,7 @@ const resolveId = (param: unknown) => {
 }
 const supplierId = computed(() => resolveId(route.params.id))
 const isLoading = ref(false)
+const submitted = ref(false)
 const form = reactive<SupplierFormData>({
     name: "",
     email: "",
@@ -146,7 +146,6 @@ const hydrateFromSupplier = (supplier: SupplierData | null) => {
 
     form.addresses = supplier.addresses.map((address) => ({
         id: address.id ?? null,
-        label: address.label ?? "",
         street: address.street ?? "",
         street2: address.street2 ?? null,
         postalCode: address.postalCode ?? "",
@@ -191,7 +190,11 @@ async function validate() {
             await updateSupplier(supplierId.value, supplierPayload)
             targetId = supplierId.value
         } else {
-            const created = await createSupplier(supplierPayload)
+            const creationPayload = {
+                ...supplierPayload,
+                ...(auth.user?.id ? { createdBy: `/api/users/${auth.user.id}` } : {}),
+            }
+            const created = await createSupplier(creationPayload)
             targetId = created.id
         }
 
diff --git a/frontend/pages/admin/supplier/supplier-list.vue b/frontend/pages/admin/supplier/supplier-list.vue
index 8b6a592..0dfa398 100644
--- a/frontend/pages/admin/supplier/supplier-list.vue
+++ b/frontend/pages/admin/supplier/supplier-list.vue
@@ -6,68 +6,28 @@
     <div v-if="auth.isAdmin" class="mt-7 border border-slate-200 mb-11">
         <div class="max-h-96 overflow-y-auto">
             <div
-                class="sticky text-primary-700 top-0 z-10 grid grid-cols-7 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
+                class="sticky text-primary-700 top-0 z-10 grid grid-cols-4 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
             >
                 <div>Nom</div>
+                <div>Téléphone</div>
                 <div>Mail</div>
-                <div>Rue</div>
-                <div>Complément</div>
-                <div>Code Postal</div>
-                <div>Ville</div>
-                <div>Pays</div>
+                <div>Créé par</div>
             </div>
 
             <div v-if="supplierList.length === 0" class="px-4 py-6 text-slate-400">
                 Aucun fournisseur.
             </div>
 
-            <div v-for="supplier in supplierList" :key="supplier.id">
-                <div
-                    v-if="!supplier.addresses || supplier.addresses.length === 0"
-                    class="grid text-primary-700  grid-cols-7 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
-                    @click="goToSupplier(supplier.id)"
-                >
-                    <div class="truncate">{{ supplier.name }}</div>
-                    <div class="truncate">{{ supplier.email }}</div>
-                    <div class="col-span-1">Pas d'adresse</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                    <div class="uppercase truncate">{{"—"}}</div>
-                </div>
-
-                <template v-else-if="supplier.addresses.length > 0">
-                    <div
-                        v-for="(address, idx) in supplier.addresses"
-                        :key="address.id ?? `${supplier.id}-${idx}-${address.street}-${address.postalCode}`"
-                        class="grid grid-cols-7 text-primary-700 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
-                        :class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
-                        @click="goToSupplier(supplier.id)"
-                    >
-                        <div class="truncate">
-                            {{ idx === 0 ? supplier.name : "↳" }}
-                        </div>
-                        <div class="truncate">{{ idx === 0 ? supplier.email : ""  }}</div>
-                        <div class="truncate">{{ address.street || "—" }}</div>
-                        <div class="truncate">{{ address.street2 || "—" }}</div>
-                        <div>{{ address.postalCode || "—"  }}</div>
-                        <div class="uppercase truncate">{{ address.city || "—"  }}</div>
-                        <div class="uppercase truncate">{{ address.countryCode || "—" }}</div>
-                    </div>
-                </template>
-
-                <template v-else>
-                    <div
-                        class="grid grid-cols-7 text-primary-700 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
-                        @click="goToSupplier(supplier.id)"
-                    >
-                        <div class="truncate">{{ supplier.name }}</div>
-                        <div class="truncate">{{ supplier.email }}</div>
-                        <div class="col-span-5 text-slate-400">
-                            Adresses non chargées
-                        </div>
-                    </div>
-                </template>
+            <div
+                v-for="supplier in supplierList"
+                :key="supplier.id"
+                class="grid grid-cols-4 text-primary-700 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                @click="goToSupplier(supplier.id)"
+            >
+                <div class="truncate">{{ supplier.name || "—" }}</div>
+                <div class="truncate">{{ supplier.phone || "—" }}</div>
+                <div class="truncate">{{ supplier.email || "—" }}</div>
+                <div class="truncate">{{ supplier.createdBy?.username || "—" }}</div>
             </div>
         </div>
     </div>
diff --git a/frontend/pages/admin/user/[[id]].vue b/frontend/pages/admin/user/[[id]].vue
index 86b0d9a..6c27542 100644
--- a/frontend/pages/admin/user/[[id]].vue
+++ b/frontend/pages/admin/user/[[id]].vue
@@ -1,5 +1,5 @@
 <template>
-    <form @submit.prevent="validate">
+    <form :class="{ submitted }" @submit.prevent="validate">
         <div class="flex items-center relative">
             <div class="flex flex-row absolute -left-[60px]">
                 <Icon
@@ -21,6 +21,7 @@
                 label="Nom de l'utilisateur"
                 :disabled="!auth.isAdmin"
                 wrapper-class="w-[280px]"
+                required
             />
 
             <UiSelect
@@ -30,6 +31,7 @@
                 :options="ROLE"
                 :disabled="!auth.isAdmin"
                 wrapper-class="w-[280px]"
+                required
             />
 
             <UiTextInput
@@ -39,6 +41,7 @@
                 type="password"
                 :disabled="!auth.isAdmin"
                 wrapper-class="w-[280px]"
+                required
             />
         </div>
 
@@ -47,6 +50,7 @@
                 class="inline-flex mb-28 items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
                 type="submit"
                 :disabled="isLoading || isHydrating || !auth.isAdmin"
+                @click="submitted = true"
             >
                 <Icon :name="userId ? '' : 'mdi:plus'" size="28" />
                 {{ userId ? 'Valider' : 'Ajouter' }}
@@ -68,6 +72,7 @@ const auth = useAuthStore()
 const userId = computed(() => resolveUserId(route.params.id))
 const isLoading = ref(false)
 const isHydrating = ref(false)
+const submitted = ref(false)
 
 const resolveUserId = (param: unknown) => {
     const idStr = Array.isArray(param) ? param[0] : param
diff --git a/frontend/pages/reception/[[id]].vue b/frontend/pages/reception/[[id]].vue
index 1de37c2..7cec0ce 100644
--- a/frontend/pages/reception/[[id]].vue
+++ b/frontend/pages/reception/[[id]].vue
@@ -2,7 +2,7 @@
     <div class="flex justify-between h-[52px] mb-[80px]">
         <div class="flex flex-1 mr-16">
             <UiStepper
-                :labels="RECEPTION_STEP_LABELS"
+                :labels="stepLabels"
                 :current-step="storeReception?.currentStep ?? 0"
                 @select="handleStepSelect"
             />
@@ -15,76 +15,70 @@
         </UiButton>
     </div>
     <ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
-    <ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
+    <WorkflowWeight
+        v-if="storeReception?.currentStep === 1"
+        mode="gross"
+        entity-name="reception"
+        api-resource="receptions"
+        :title-label="receptionConfig.weighingLabels.gross"
+        :is-final="false"
+        :entity="storeReception"
+        :get-weight-from-scale="getWeight"
+        :update-entity="receptionStore.updateReception"
+        :load-entity="receptionStore.loadReception"
+        :clear-entity="receptionStore.clearCurrent"
+        :build-receipt-filename="receptionConfig.buildReceiptFilename"
+    />
     <ReceptionProductReceived
         v-if="storeReception?.currentStep === 2 &&
             receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"/>
     <ReceptionBovineReceived
         v-if="storeReception?.currentStep === 2 &&
             receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"/>
-    <ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
+    <WorkflowWeight
+        v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3"
+        mode="tare"
+        entity-name="reception"
+        api-resource="receptions"
+        :title-label="receptionConfig.weighingLabels.tare"
+        :is-final="true"
+        :entity="storeReception"
+        :get-weight-from-scale="getWeight"
+        :update-entity="receptionStore.updateReception"
+        :load-entity="receptionStore.loadReception"
+        :clear-entity="receptionStore.clearCurrent"
+        :build-receipt-filename="receptionConfig.buildReceiptFilename"
+    />
 </template>
 
 <script setup lang="ts">
-import {useReceptionStore} from '~/stores/reception'
-import {storeToRefs} from 'pinia'
-import {RECEPTION_STEP_LABELS} from '~/constants/steps'
-import {RECEPTION_TYPE_CODES} from "~/utils/constants";
-
-const route = useRoute()
-const router = useRouter()
+import { useReceptionStore } from '~/stores/reception'
+import { storeToRefs } from 'pinia'
+import { useWorkflowSteps } from '~/composables/useWorkflowSteps'
+import { receptionConfig } from '~/config/reception.config'
+import { getWeight } from '~/services/reception'
+import { RECEPTION_TYPE_CODES } from '~/utils/constants'
 
 const receptionStore = useReceptionStore()
-const {current: storeReception} = storeToRefs(receptionStore)
+const { current: storeReception } = storeToRefs(receptionStore)
 
-const resolveReceptionId = (param: unknown) => {
-    const idStr = Array.isArray(param) ? param[0] : param
-    if (!idStr) {
-        return null
-    }
-    const id = Number(idStr)
-    return Number.isFinite(id) ? id : null
-}
+const { stepLabels, saveAndHold, handleStepSelect } = useWorkflowSteps(receptionConfig, receptionStore)
 
+// Init route watcher
+const route = useRoute()
 watch(
     () => route.params.id,
     async (param) => {
-        const id = resolveReceptionId(param)
-        if (id === null) {
+        const idStr = Array.isArray(param) ? param[0] : param
+        if (!idStr) {
             receptionStore.clearCurrent()
             return
         }
-        await receptionStore.loadReception(id)
+        const id = Number(idStr)
+        if (Number.isFinite(id)) {
+            await receptionStore.loadReception(id)
+        }
     },
-    {immediate: true}
+    { immediate: true }
 )
-
-const saveAndHold = async () => {
-    if (!receptionStore.current) {
-        await router.push('/')
-        return
-    }
-
-    await receptionStore.updateReception(receptionStore.current.id, {
-        currentStep: receptionStore.current.currentStep,
-        licensePlate: receptionStore.current.licensePlate,
-        receptionDate: receptionStore.current.receptionDate
-    })
-    await router.push('/')
-}
-
-const handleStepSelect = async (step: number) => {
-    if (!receptionStore.current) {
-        return
-    }
-
-    if (step === receptionStore.current.currentStep) {
-        return
-    }
-
-    await receptionStore.updateReception(receptionStore.current.id, {
-        currentStep: step
-    })
-    await receptionStore.loadReception(receptionStore.current.id)
-}
 </script>
diff --git a/frontend/pages/reception/finish-reception.vue b/frontend/pages/reception/finish-reception.vue
index 65aa009..abf79a0 100644
--- a/frontend/pages/reception/finish-reception.vue
+++ b/frontend/pages/reception/finish-reception.vue
@@ -8,7 +8,7 @@
         <div class="mt-6 border border-slate-200 mb-16 ">
             <div class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
                 <div>Numéro</div>
-                <div>Date</div>
+                <div>Date et heure</div>
                 <div>Fournisseur</div>
                 <div>Adresse</div>
                 <div>Type réception</div>
@@ -23,7 +23,7 @@
                 @click="goToReception(reception.id)"
             >
                 <div>{{ reception.identificationNumber}}</div>
-                <div>{{ reception.receptionDate}}</div>
+                <div>{{ formatDate(reception.receptionDate) }}</div>
                 <div>{{ reception.supplier?.name }}</div>
                 <div>{{ reception.address?.fullAddress }}</div>
                 <div>{{ reception.receptionType?.label }}</div>
@@ -41,6 +41,19 @@ import type {ShipmentData} from "~/services/dto/shipment-data";
 const receptionList = ref<ReceptionData[]>()
 const router = useRouter()
 
+const formatDate = (date: string | null) => {
+    if (!date) return '—'
+    const d = new Date(date.replace(' ', 'T'))
+    if (isNaN(d.getTime())) return date
+    return d.toLocaleDateString('fr-FR', {
+        day: '2-digit',
+        month: '2-digit',
+        year: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit'
+    })
+}
+
 const formatWeighing = (reception: ReceptionData) => {
     const gross = reception.weights?.find((weight) => weight.type === 'gross')?.weight
     const tare = reception.weights?.find((weight) => weight.type === 'tare')?.weight
diff --git a/frontend/pages/reception/update/[[id]].vue b/frontend/pages/reception/update/[[id]].vue
index 8c564a1..3a2bcd2 100644
--- a/frontend/pages/reception/update/[[id]].vue
+++ b/frontend/pages/reception/update/[[id]].vue
@@ -1,13 +1,15 @@
 <template>
 
-    <form @submit.prevent="validate">
+    <form :class="{ submitted }" @submit.prevent="validate">
         <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-[60px]">
             <div class="flex items-center justify-between gap-10 relative">
                 <div class="flex flex-row absolute -left-[60px] justify-between">
                     <Icon @click="router.push('/reception/finish-reception')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
                 </div>
                 <h1 class="font-bold text-4xl col-start-1 row-start-1 text-primary-500 uppercase">Réception {{ form.identificationNumber }}</h1>
-                <Icon @click="printReceipt" name="mdi:printer-outline" size="44" class="cursor-pointer text-primary-500"/>
+                <div class="bg-primary-500 p-1 rounded-md flex items-center" title="Imprimer" @click="printReceipt">
+                    <Icon name="mdi:printer-outline" size="32" class="cursor-pointer text-white"/>
+                </div>
             </div>
             <!--    Nom de l'utilisateur       -->
             <UiSelect
@@ -21,6 +23,7 @@
                 }))"
                 :loading="isLoadingUsers"
                 wrapper-class="col-start-1 row-start-2"
+                required
             />
             <!--    Date de réception        -->
             <UiDateInput
@@ -29,6 +32,7 @@
                 v-model="form.receptionDate"
                 label="Date de réception"
                 wrapper-class="col-start-1 row-start-3"
+                required
             />
             <!--    type de reception        -->
             <UiSelect
@@ -42,6 +46,7 @@
                 }))"
                 :loading="isLoadingSuppliers"
                 wrapper-class="col-start-1 row-start-4"
+                required
             />
             <!--    Fournisseur        -->
             <UiSelect
@@ -55,6 +60,7 @@
                 }))"
                 :loading="isLoadingSuppliers"
                 wrapper-class="col-start-1 row-start-5"
+                required
             />
             <!--    Adresse fournisseur        -->
             <UiSelect
@@ -67,6 +73,7 @@
                 }))"
                 :disabled="(isLoadingSuppliers || supplierAddresses.length === 0) && !auth.isAdmin"
                 wrapper-class="col-start-2 row-start-1"
+                required
             />
             <!--    Camion        -->
             <UiSelect
@@ -80,6 +87,7 @@
                 }))"
                 :loading="isLoadingTrucks"
                 wrapper-class="col-start-2 row-start-2"
+                required
             />
             <!--    Transporteur        -->
             <UiSelect
@@ -94,6 +102,7 @@
                 :loading="isLoadingCarriers"
                 select-class="h-[34px]"
                 wrapper-class="col-start-2 row-start-3"
+                required
             />
             <!--    Chauffeur (LIOT)        -->
             <UiSelect
@@ -108,6 +117,7 @@
                 :loading="isLoadingDrivers"
                 wrapper-class="col-start-2 row-start-5"
                 v-if="isLiotCarrier"
+                required
             />
             <!--    Plaque d'immatriculation       -->
             <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
@@ -115,6 +125,7 @@
                     :disabled="!auth.isAdmin"
                     v-model="form.licensePlate"
                     v-model:allowAny="allowAnyLicensePlate"
+                    required
                 />
             </div>
             <!--    Immatriculation (LIOT)        -->
@@ -130,27 +141,37 @@
                 :loading="isLoadingVehicles"
                 :disabled="(isLoadingVehicles || filteredVehicles.length === 0) && !auth.isAdmin"
                 wrapper-class="col-start-2 row-start-4"
+                required
             />
         </div>
             <div v-if="formIsLoading">
             <div class="flex justify-evenly gap-y-8 gap-x-41 mb-10 border-b border-primary-500/60">
                 <h1
-                    class="font-bold text-3xl uppercase px-12 col-start-1 row-start-1  cursor-pointer "
-                    :class="activeTab === 'weights' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50'"
+                    class="font-bold text-3xl uppercase px-12 col-start-1 row-start-1 cursor-pointer"
+                    :class="[
+                        activeTab === 'weights' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50',
+                        hasGrossWeightError ? '!text-red-500 !border-red-500' : ''
+                    ]"
                     @click="activeTab = 'weights'"
                 >
                     pesée à plein
                 </h1>
                 <h1
-                    class="font-bold text-3xl uppercase col-start-1 row-start-1 px-12 cursor-pointer "
-                    :class="activeTab === 'weightsEmpty' ? 'border-b-[6px] border-primary-500 text-primary-500 ' : 'text-primary-500/50'"
+                    class="font-bold text-3xl uppercase col-start-1 row-start-1 px-12 cursor-pointer"
+                    :class="[
+                        activeTab === 'weightsEmpty' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50',
+                        hasTareWeightError ? '!text-red-500 !border-red-500' : ''
+                    ]"
                     @click="activeTab = 'weightsEmpty'"
                 >
                     pesée à vide
                 </h1>
                 <h1
-                    class="font-bold text-3xl uppercase px-12 col-start-2 row-start-1 cursor-pointer "
-                    :class="activeTab === 'merchandise' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50'"
+                    class="font-bold text-3xl uppercase px-12 col-start-2 row-start-1 cursor-pointer"
+                    :class="[
+                        activeTab === 'merchandise' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50',
+                        hasMerchandiseTabError ? '!text-red-500 !border-red-500' : ''
+                    ]"
                     @click="activeTab = 'merchandise'"
                 >
                     {{ isMerchandise ? "Marchandise" : "Bovins" }}
@@ -176,6 +197,9 @@
                     v-model="merchandiseForm"
                     :isAdmin="auth.isAdmin"
                 />
+                <p v-if="activeTab === 'merchandise' && isMerchandise" class="text-red-500 text-sm mt-2" :class="showMerchandiseError ? '' : 'invisible'">
+                    {{ merchandiseErrorMessage || '&nbsp;' }}
+                </p>
 
                 <update-bovin
                     v-if="activeTab === 'merchandise' && !isMerchandise"
@@ -183,12 +207,16 @@
                     v-model:otherQuantity="bovineOtherQuantity"
                     :isAdmin="auth.isAdmin"
                 />
+                <p v-if="activeTab === 'merchandise' && !isMerchandise" class="text-red-500 text-sm mt-2" :class="showMerchandiseError ? '' : 'invisible'">
+                    {{ merchandiseErrorMessage || '&nbsp;' }}
+                </p>
             </div>
                 <div class="flex justify-center">
                     <UiButton
                         v-if="auth.isAdmin"
                         type="submit"
                         class="inline-flex mb-16 items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2 justify-self-end"
+                        @click="submitted = true"
                     >
                         Valider
                     </UiButton>
@@ -239,7 +267,9 @@ import { getVehicleList } from '~/services/vehicle'
 import { createWeight, updateWeight } from '~/services/weight'
 import { useAuthStore } from '~/stores/auth'
 import { useReceptionStore } from '~/stores/reception'
-import { RECEPTION_TYPE_CODES, SUPPLIER_CODE } from '~/utils/constants'
+import { MERCHANDISE_TYPE_CODES, RECEPTION_TYPE_CODES, SUPPLIER_CODE } from '~/utils/constants'
+import { getMerchandiseTypeList } from '~/services/merchandise-type'
+import type { MerchandiseTypeData } from '~/services/dto/merchandise-type-data'
 
 const router = useRouter()
 const route = useRoute()
@@ -260,6 +290,17 @@ const merchandiseForm = ref<MerchandiseEntryData>({
     selectedPelletBuildingIds: {}
 })
 const allowAnyLicensePlate = ref(false)
+const submitted = ref(false)
+const showMerchandiseError = ref(false)
+const merchandiseErrorMessage = ref('')
+
+const hasGrossWeightError = computed(() =>
+    submitted.value && (grossWeight.value.weight === null || grossWeight.value.weighedAt === null || grossWeight.value.dsd === null)
+)
+const hasTareWeightError = computed(() =>
+    submitted.value && (tareWeight.value.weight === null || tareWeight.value.weighedAt === null || tareWeight.value.dsd === null)
+)
+const hasMerchandiseTabError = computed(() => submitted.value && showMerchandiseError.value)
 const isLoading = ref(false)
 const users = ref<UserData[]>([])
 const isLoadingUsers = ref(false)
@@ -277,6 +318,7 @@ const vehicles = ref<VehicleData[]>([])
 const isLoadingVehicles = ref(false)
 const formIsLoading = ref(false)
 const isMerchandise = ref(false)
+const merchandiseTypesList = ref<MerchandiseTypeData[]>([])
 const isHydrating = ref(false)
 const vehicleSyncLock = ref(false)
 
@@ -436,7 +478,7 @@ function hydrateFromReception(reception: ReceptionData | null) {
     isHydrating.value = true
     form.identificationNumber = reception?.identificationNumber ?? ''
     form.licensePlate = reception?.licensePlate ?? ''
-    form.receptionDate = reception?.receptionDate ?? new Date().toISOString().slice(0, 10)
+    form.receptionDate = reception?.receptionDate?.slice(0, 10) ?? new Date().toISOString().slice(0, 10)
     form.userId = reception?.user?.id
         ? String(reception.user.id)
         : form.userId
@@ -776,6 +818,53 @@ async function validate() {
     }
 
     if (idReception) {
+        const hasInvalidWeights =
+            grossWeight.value.weight === null || grossWeight.value.weighedAt === null || grossWeight.value.dsd === null ||
+            tareWeight.value.weight === null || tareWeight.value.weighedAt === null || tareWeight.value.dsd === null
+
+        if (hasInvalidWeights) {
+            return
+        }
+
+        showMerchandiseError.value = false
+        merchandiseErrorMessage.value = ''
+
+        if (!isMerchandise.value && getTotalBovines() === 0) {
+            showMerchandiseError.value = true
+            merchandiseErrorMessage.value = 'Veuillez saisir au moins une race bovine.'
+            return
+        }
+
+        if (isMerchandise.value) {
+            const selectedType = merchandiseTypesList.value.find(
+                (t) => String(t.id) === merchandiseForm.value.merchandiseTypeId
+            )
+            const isAutresType = selectedType?.code === MERCHANDISE_TYPE_CODES.AUTRES
+            const isGranuleType = selectedType?.code === MERCHANDISE_TYPE_CODES.GRANULE
+
+            if (isAutresType && !merchandiseForm.value.merchandiseDetail.trim()) {
+                showMerchandiseError.value = true
+                merchandiseErrorMessage.value = 'Veuillez préciser le type de marchandise.'
+                return
+            }
+
+            if (!isAutresType && !isGranuleType && merchandiseForm.value.selectedBuildingIds.length === 0) {
+                showMerchandiseError.value = true
+                merchandiseErrorMessage.value = 'Veuillez sélectionner au moins un bâtiment.'
+                return
+            }
+
+            if (isGranuleType) {
+                const hasAny = Object.values(merchandiseForm.value.selectedPelletBuildingIds)
+                    .some((ids) => ids.length > 0)
+                if (!hasAny) {
+                    showMerchandiseError.value = true
+                    merchandiseErrorMessage.value = 'Veuillez sélectionner au moins un bâtiment.'
+                    return
+                }
+            }
+        }
+
         await receptionStore.updateReception(idReception, {
             ...payload
         })
@@ -820,6 +909,7 @@ async function validate() {
 
 onMounted(async () => {
     await loadTypes()
+    merchandiseTypesList.value = await getMerchandiseTypeList()
     syncMerchandiseFlag()
     formIsLoading.value = true
     await loadUsers()
diff --git a/frontend/pages/reception/waiting-reception.vue b/frontend/pages/reception/waiting-reception.vue
index b6db72c..11125bc 100644
--- a/frontend/pages/reception/waiting-reception.vue
+++ b/frontend/pages/reception/waiting-reception.vue
@@ -1,48 +1,61 @@
 <template>
-    <div class="flex items-center justify-between">
-        <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
-            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions en attente</h1>
-        </div>
-    </div>
-
-    <div class="px-[86px]">
-        <div class="mt-6 border border-slate-200 mb-16">
-            <div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
-                <div>Fournisseur</div>
-                <div>Adresse</div>
-                <div>Type réception</div>
-                <div>Transporteur</div>
-                <div>Immatriculation</div>
-            </div>
-            <div
-                v-for="reception in receptionList"
-                :key="reception.id"
-                class="grid grid-cols-5 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
-                role="button"
-                tabindex="0"
-                @click="goToReception(reception.id)"
-                @keydown.enter="goToReception(reception.id)"
-            >
-                <div>{{ reception.supplier?.name }}</div>
-                <div>{{ reception.address?.fullAddress }}</div>
-                <div>{{ reception.receptionType?.label }}</div>
-                <div>{{ reception.carrier?.name }}</div>
-                <div>{{ reception.licensePlate }}</div>
-            </div>
-        </div>
-    </div>
+    <WorkflowWaitingList
+        title="listes des réceptions en attente"
+        :columns="columns"
+        :items="receptionList ?? []"
+        route-prefix="/reception"
+        show-actions
+    >
+        <template #cell-receptionDate="{ item }">
+            {{ formatDate(item.receptionDate) }}
+        </template>
+        <template #actions="{ item }">
+            <Icon
+                name="mdi:delete-outline"
+                size="24"
+                class="cursor-pointer text-red-500 hover:text-red-700"
+                @click="confirmDelete(item)"
+            />
+        </template>
+    </WorkflowWaitingList>
 </template>
 
 <script setup lang="ts">
-import type {ReceptionData} from "~/services/dto/reception-data";
-import {getReceptionList} from "~/services/reception";
+import type { ReceptionData } from '~/services/dto/reception-data'
+import { getReceptionList, deleteReception } from '~/services/reception'
+
+const columns = [
+    { key: 'receptionDate', label: 'Date et heure' },
+    { key: 'supplier.name', label: 'Fournisseur' },
+    { key: 'address.fullAddress', label: 'Adresse' },
+    { key: 'receptionType.label', label: 'Type réception' },
+    { key: 'carrier.name', label: 'Transporteur' },
+    { key: 'licensePlate', label: 'Immatriculation' }
+]
 
 const receptionList = ref<ReceptionData[]>()
-const router = useRouter()
 
-const goToReception = (id: number) => {
-        router.push(`/reception/${id}`)
+const formatDate = (date: string | null) => {
+    if (!date) return '—'
+    const d = new Date(date.replace(' ', 'T'))
+    if (isNaN(d.getTime())) return date
+    return d.toLocaleDateString('fr-FR', {
+        day: '2-digit',
+        month: '2-digit',
+        year: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit'
+    })
+}
+
+const confirmDelete = async (reception: ReceptionData) => {
+    const confirmed = window.confirm(
+        `Êtes-vous sûr de vouloir supprimer la réception ${reception.identificationNumber ?? `#${reception.id}`} ? Toutes les données liées seront supprimées.`
+    )
+    if (!confirmed) return
+
+    await deleteReception(reception.id)
+    receptionList.value = receptionList.value?.filter(r => r.id !== reception.id)
 }
 
 onMounted(async () => {
diff --git a/frontend/pages/shipment/[[id]].vue b/frontend/pages/shipment/[[id]].vue
index 6f6f3ae..efd5a54 100644
--- a/frontend/pages/shipment/[[id]].vue
+++ b/frontend/pages/shipment/[[id]].vue
@@ -3,10 +3,9 @@
         <div class="flex justify-between h-[52px] mb-[80px]">
             <div class="flex flex-1 mr-16">
                 <UiStepper
-                    :labels="SHIPMENT_STEP_LABELS"
+                    :labels="stepLabels"
                     :current-step="storeShipment?.currentStep ?? 0"
                     @select="handleStepSelect"
-
                 />
             </div>
             <UiButton
@@ -17,45 +16,69 @@
             </UiButton>
         </div>
         <ShipmentForm v-if="!storeShipment || storeShipment.currentStep === 0" ref="shipmentFormRef"/>
-        <ShipmentWeight v-if="storeShipment?.currentStep === 1" mode="gross"/>
+        <WorkflowWeight
+            v-if="storeShipment?.currentStep === 1"
+            mode="gross"
+            entity-name="shipment"
+            api-resource="shipments"
+            :title-label="shipmentConfig.weighingLabels.gross"
+            :is-final="false"
+            :entity="storeShipment"
+            :get-weight-from-scale="getWeightShipment"
+            :update-entity="shipmentStore.updateShipment"
+            :load-entity="shipmentStore.loadShipment"
+            :clear-entity="shipmentStore.clearCurrent"
+            :build-receipt-filename="shipmentConfig.buildReceiptFilename"
+        />
         <ShipmentLoading v-if="storeShipment?.currentStep === 2"/>
-        <ShipmentWeight v-if="storeShipment?.currentStep === 3" mode="tare"/>
-
+        <WorkflowWeight
+            v-if="storeShipment?.currentStep === 3"
+            mode="tare"
+            entity-name="shipment"
+            api-resource="shipments"
+            :title-label="shipmentConfig.weighingLabels.tare"
+            :is-final="true"
+            :entity="storeShipment"
+            :get-weight-from-scale="getWeightShipment"
+            :update-entity="shipmentStore.updateShipment"
+            :load-entity="shipmentStore.loadShipment"
+            :clear-entity="shipmentStore.clearCurrent"
+            :build-receipt-filename="shipmentConfig.buildReceiptFilename"
+        />
     </div>
 </template>
-<script setup lang="ts">
 
-import {SHIPMENT_STEP_LABELS} from "~/constants/steps";
-import {storeToRefs} from "pinia";
-import {useShipmentStore} from "~/stores/shipment";
+<script setup lang="ts">
+import { storeToRefs } from 'pinia'
+import { useShipmentStore } from '~/stores/shipment'
+import { useWorkflowSteps } from '~/composables/useWorkflowSteps'
+import { shipmentConfig } from '~/config/shipment.config'
+import { getWeightShipment } from '~/services/shipment'
 import { ref, watch } from 'vue'
+
 const shipmentStore = useShipmentStore()
-const {current: storeShipment} = storeToRefs(shipmentStore)
+const { current: storeShipment } = storeToRefs(shipmentStore)
 const shipmentFormRef = ref<{ saveDraft: () => Promise<void> } | null>(null)
 
+const { stepLabels, handleStepSelect } = useWorkflowSteps(shipmentConfig, shipmentStore)
+
 const route = useRoute()
 const router = useRouter()
 
-const resolveShipmentId = (param: unknown) => {
-    const idStr = Array.isArray(param) ? param[0] : param
-    if (!idStr) {
-        return null
-    }
-    const id = Number(idStr)
-    return Number.isFinite(id) ? id : null
-}
-
-watch (
+watch(
     () => route.params.id,
     async (param) => {
-        const id = resolveShipmentId(param)
-        if (id === null) {
+        const idStr = Array.isArray(param) ? param[0] : param
+        if (!idStr) {
             shipmentStore.clearCurrent()
             return
         }
-        await shipmentStore.loadShipment(id)
+        const id = Number(idStr)
+        if (Number.isFinite(id)) {
+            await shipmentStore.loadShipment(id)
+        }
     },
-    {immediate: true}
+    { immediate: true }
 )
 
 const saveAndHold = async () => {
@@ -64,20 +87,4 @@ const saveAndHold = async () => {
     }
     await router.push('/')
 }
-const handleStepSelect = async (step: number) => {
-    if (!shipmentStore.current) {
-        return
-    }
-
-    if (step === shipmentStore.current.currentStep) {
-        return
-    }
-
-    await shipmentStore.updateShipment(shipmentStore.current.id, {
-        currentStep: step
-    })
-    await shipmentStore.loadShipment(shipmentStore.current.id)
-}
-
-
 </script>
diff --git a/frontend/pages/shipment/update/[[id]].vue b/frontend/pages/shipment/update/[[id]].vue
index 556d697..8a0264b 100644
--- a/frontend/pages/shipment/update/[[id]].vue
+++ b/frontend/pages/shipment/update/[[id]].vue
@@ -1,12 +1,14 @@
 <template>
-    <form @submit.prevent="validate">
+    <form :class="{ submitted }" @submit.prevent="validate">
         <div class="grid grid-cols-2 h-[461px] items-start gap-y-8 gap-x-40 mb-16">
             <div class="flex items-center justify-between gap-10 relative col-start-1 row-start-1">
                 <div class="flex flex-row absolute -left-[60px] justify-between">
                     <Icon @click="router.push('/shipment/finish-shipment')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
                 </div>
                 <h1 class="font-bold text-4xl col-start-1 row-start-1 text-primary-500 uppercase">Expédition {{ form.identificationNumber }}</h1>
-                <Icon @click="printReceipt" name="mdi:printer-outline" size="44" class="cursor-pointer text-primary-500"/>
+                <div class="bg-primary-500 p-1 rounded-md flex items-center" title="Imprimer" @click="printReceipt">
+                    <Icon name="mdi:printer-outline" size="32" class="cursor-pointer text-white"/>
+                </div>
             </div>
 
             <UiSelect
@@ -19,6 +21,7 @@
                 }))"
                 :loading="isLoadingUsers"
                 wrapper-class="col-start-1 row-start-2"
+                required
             />
 
             <UiDateInput
@@ -26,6 +29,7 @@
                 v-model="form.shipmentDate"
                 label="Date d'expédition"
                 wrapper-class="col-start-1 row-start-3"
+                required
             />
 
             <div class="col-start-1 row-start-4 h-[64px]">
@@ -41,6 +45,7 @@
                             value: String(type.id),
                             label: type.label
                         }))"
+                        required
                     />
                     <UiNumberInput
                         id="shipment-type-quantity"
@@ -63,6 +68,7 @@
                 }))"
                 :loading="isLoadingCustomers"
                 wrapper-class="col-start-1 row-start-5"
+                required
             />
 
             <UiSelect
@@ -72,6 +78,7 @@
                 :disabled="isLoadingCustomers || customerAddresses.length === 0"
                 label="Adresse"
                 wrapper-class="col-start-2 row-start-1"
+                required
             />
 
             <UiSelect
@@ -84,6 +91,7 @@
                 }))"
                 :loading="isLoadingTrucks"
                 wrapper-class="col-start-2 row-start-2"
+                required
             />
 
             <UiSelect
@@ -95,12 +103,14 @@
                     label: carrier.name
                 }))"
                 wrapper-class="col-start-2 row-start-3"
+                required
             />
 
             <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
                 <UiLicensePlateInput
                     v-model="form.licensePlate"
                     v-model:allowAny="allowAnyLicensePlate"
+                    required
                 />
             </div>
 
@@ -116,6 +126,7 @@
                 :loading="isLoadingVehicles"
                 :disabled="isLoadingVehicles || filteredVehicles.length === 0"
                 wrapper-class="col-start-2 row-start-4"
+                required
             />
 
             <div class="col-start-2 row-start-5 min-h-[72px]">
@@ -129,6 +140,7 @@
                         label: driver.name
                     }))"
                     :loading="isLoadingDrivers"
+                    required
                 />
             </div>
         </div>
@@ -137,14 +149,20 @@
             <div class="flex justify-evenly gap-y-8 gap-x-41 mb-10 border-b border-primary-500/60">
                 <h1
                     class="font-bold text-3xl uppercase px-12 col-start-1 row-start-1 cursor-pointer"
-                    :class="activeTab === 'weights' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50'"
+                    :class="[
+                        activeTab === 'weights' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50',
+                        hasGrossWeightError ? '!text-red-500 !border-red-500' : ''
+                    ]"
                     @click="activeTab = 'weights'"
                 >
                     pesée à plein
                 </h1>
                 <h1
                     class="font-bold text-3xl uppercase col-start-1 row-start-1 px-12 cursor-pointer"
-                    :class="activeTab === 'weightsEmpty' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50'"
+                    :class="[
+                        activeTab === 'weightsEmpty' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50',
+                        hasTareWeightError ? '!text-red-500 !border-red-500' : ''
+                    ]"
                     @click="activeTab = 'weightsEmpty'"
                 >
                     pesée à vide
@@ -170,6 +188,7 @@
             <UiButton
                 type="submit"
                 class="text-xl mb-16 uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
+                @click="submitted = true"
             >
                 Valider
             </UiButton>
@@ -220,6 +239,15 @@ const currentShipment = ref<ShipmentData | null>(null)
 const selectedShipmentTypeId = ref('')
 const shipmentQuantity = ref<number | null>(0)
 const allowAnyLicensePlate = ref(false)
+const submitted = ref(false)
+
+const hasGrossWeightError = computed(() =>
+    submitted.value && (grossWeight.value.weight === null || grossWeight.value.weighedAt === null || grossWeight.value.dsd === null)
+)
+const hasTareWeightError = computed(() =>
+    submitted.value && (tareWeight.value.weight === null || tareWeight.value.weighedAt === null || tareWeight.value.dsd === null)
+)
+
 const activeTab = ref<'weightsEmpty' | 'weights'>('weights')
 const grossWeight = ref<WeightEntryData>(createEmptyWeightEntry('gross'))
 const tareWeight = ref<WeightEntryData>(createEmptyWeightEntry('tare'))
@@ -376,7 +404,7 @@ function hydrateFromShipment(shipment: ShipmentData | null) {
     isHydrating.value = true
     form.identificationNumber = shipment.identificationNumber ?? null
     form.licensePlate = shipment.licensePlate ?? ''
-    form.shipmentDate = shipment.shipmentDate ?? new Date().toISOString().slice(0, 10)
+    form.shipmentDate = shipment.shipmentDate?.slice(0, 10) ?? new Date().toISOString().slice(0, 10)
     form.userId = shipment.user?.id ? String(shipment.user.id) : form.userId
     form.customerId = shipment.customer?.id ? String(shipment.customer.id) : ''
     form.addressId = shipment.address?.id ? String(shipment.address.id) : ''
@@ -613,6 +641,14 @@ async function validate() {
         return
     }
 
+    const hasInvalidWeights =
+        grossWeight.value.weight === null || grossWeight.value.weighedAt === null || grossWeight.value.dsd === null ||
+        tareWeight.value.weight === null || tareWeight.value.weighedAt === null || tareWeight.value.dsd === null
+
+    if (hasInvalidWeights) {
+        return
+    }
+
     await updateShipment(shipmentId.value, {
         currentStep: currentShipment.value?.currentStep ?? 0,
         ...buildPayload()
diff --git a/frontend/pages/shipment/waiting-shipment.vue b/frontend/pages/shipment/waiting-shipment.vue
index c3964d1..d6770c3 100644
--- a/frontend/pages/shipment/waiting-shipment.vue
+++ b/frontend/pages/shipment/waiting-shipment.vue
@@ -1,73 +1,85 @@
 <template>
-    <div class="flex items-center justify-between">
-        <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
-            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions en attente</h1>
-        </div>
-    </div>
-
-    <div class="px-[86px]">
-        <div class="mt-6 border border-slate-200 mb-16 ">
-            <div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
-                <div>Client</div>
-                <div>Adresse</div>
-                <div>Type d'expéditions</div>
-                <div>Transporteur</div>
-                <div>Immatriculation</div>
-            </div>
-            <div
-                v-for="shipment in shipmentList"
-                :key="shipment.id"
-                class="grid grid-cols-5 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
-                role="button"
-                tabindex="0"
-                @click="goToShipment(shipment.id)"
-                @keydown.enter="goToShipment(shipment.id)"
-            >
-                <div>{{ shipment.customer?.name }}</div>
-                <div>{{ shipment.address?.fullAddress }}</div>
-                <div>
-                    <template v-if="formatShipmentLines(shipment).length">
-                        <div
-                            v-for="(line, index) in formatShipmentLines(shipment)"
-                            :key="index"
-                            class="leading-5"
-                        >
-                            {{ line }}
-                        </div>
-                    </template>
+    <WorkflowWaitingList
+        title="listes des expéditions en attente"
+        :columns="columns"
+        :items="shipmentList ?? []"
+        route-prefix="/shipment"
+        show-actions
+    >
+        <template #cell-shipmentDate="{ item }">
+            {{ formatDate(item.shipmentDate) }}
+        </template>
+        <template #cell-shipmentType="{ item }">
+            <template v-if="formatShipmentLines(item).length">
+                <div
+                    v-for="(line, index) in formatShipmentLines(item)"
+                    :key="index"
+                    class="leading-5"
+                >
+                    {{ line }}
                 </div>
-                <div>{{ shipment.carrier?.name }}</div>
-                <div>{{ shipment.licensePlate }}</div>
-            </div>
-        </div>
-    </div>
+            </template>
+            <template v-else>—</template>
+        </template>
+        <template #actions="{ item }">
+            <Icon
+                name="mdi:delete-outline"
+                size="24"
+                class="cursor-pointer text-red-500 hover:text-red-700"
+                @click="confirmDelete(item)"
+            />
+        </template>
+    </WorkflowWaitingList>
 </template>
 
 <script setup lang="ts">
+import type { ShipmentData } from '~/services/dto/shipment-data'
+import { getShipmentList, deleteShipment } from '~/services/shipment'
 
-import type {ShipmentData} from "~/services/dto/shipment-data";
-import {getShipmentList} from "~/services/shipment";
+const columns = [
+    { key: 'shipmentDate', label: 'Date et heure' },
+    { key: 'customer.name', label: 'Client' },
+    { key: 'address.fullAddress', label: 'Adresse' },
+    { key: 'shipmentType', label: "Type d'expé." },
+    { key: 'carrier.name', label: 'Transporteur' },
+    { key: 'licensePlate', label: 'Immatriculation' }
+]
 
 const shipmentList = ref<ShipmentData[]>()
-const router = useRouter()
 
-const goToShipment = (id: number) => {
-    router.push(`/shipment/${id}`)
+const formatDate = (date: string | null) => {
+    if (!date) return '—'
+    const d = new Date(date.replace(' ', 'T'))
+    if (isNaN(d.getTime())) return date
+    return d.toLocaleDateString('fr-FR', {
+        day: '2-digit',
+        month: '2-digit',
+        year: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit'
+    })
 }
 
 const formatShipmentLines = (shipment: ShipmentData) => {
     if (!shipment.shipmentType && shipment.nbBovinSend == null) {
         return []
     }
-
     const label = typeof shipment.shipmentType === 'string'
         ? shipment.shipmentType
         : shipment.shipmentType?.label
-
     return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
 }
 
+const confirmDelete = async (shipment: ShipmentData) => {
+    const confirmed = window.confirm(
+        `Êtes-vous sûr de vouloir supprimer l'expédition ${shipment.identificationNumber ?? `#${shipment.id}`} ? Toutes les données liées seront supprimées.`
+    )
+    if (!confirmed) return
+
+    await deleteShipment(shipment.id)
+    shipmentList.value = shipmentList.value?.filter(s => s.id !== shipment.id)
+}
+
 onMounted(async () => {
     shipmentList.value = await getShipmentList(false)
 })
diff --git a/frontend/services/address.ts b/frontend/services/address.ts
index 4b353c8..6aad424 100644
--- a/frontend/services/address.ts
+++ b/frontend/services/address.ts
@@ -1,7 +1,6 @@
 import { useApi } from '~/composables/useApi'
-import type { AddressData } from '~/services/dto/address-data'
+
 export interface AddressPayload {
-    label: string
     street: string
     street2?: string | null
     postalCode: string
diff --git a/frontend/services/dto/address-data.ts b/frontend/services/dto/address-data.ts
index 11ce1e6..0b3124c 100644
--- a/frontend/services/dto/address-data.ts
+++ b/frontend/services/dto/address-data.ts
@@ -1,6 +1,6 @@
 export interface AddressData {
     id: number
-    label: string
+    label?: string | null
     street: string
     street2?: string | null
     postalCode: string
@@ -11,7 +11,7 @@ export interface AddressData {
 
 export interface AddressFormData {
     id?: number | null
-    label: string
+    label?: string | null
     street: string
     street2?: string | null
     postalCode: string
diff --git a/frontend/services/dto/customer-data.ts b/frontend/services/dto/customer-data.ts
index 90e00a9..9fb01f1 100644
--- a/frontend/services/dto/customer-data.ts
+++ b/frontend/services/dto/customer-data.ts
@@ -1,4 +1,5 @@
 import type { AddressFormData } from "~/services/dto/address-data"
+import type { UserData } from "~/services/dto/user-data"
 
 export type CustomerAddresses = AddressFormData[] | string[]
 
@@ -7,6 +8,7 @@ export interface CustomerData {
     name: string
     phone?: string | null
     email?: string | null
+    createdBy?: UserData | null
     addresses: CustomerAddresses
 }
 
diff --git a/frontend/services/dto/supplier-data.ts b/frontend/services/dto/supplier-data.ts
index f44eb4b..cfa7926 100644
--- a/frontend/services/dto/supplier-data.ts
+++ b/frontend/services/dto/supplier-data.ts
@@ -1,4 +1,5 @@
 import type { AddressFormData } from "~/services/dto/address-data"
+import type { UserData } from "~/services/dto/user-data"
 
 export type SupplierAddresses = AddressFormData[] | string[]
 
@@ -7,6 +8,7 @@ export interface SupplierData {
     name: string
     email?: string | null
     phone?: string | null
+    createdBy?: UserData | null
     addresses: SupplierAddresses
 }
 
diff --git a/frontend/services/reception.ts b/frontend/services/reception.ts
index 09a27e8..4a17e64 100644
--- a/frontend/services/reception.ts
+++ b/frontend/services/reception.ts
@@ -1,42 +1,22 @@
-import {useApi} from '~/composables/useApi'
-import type {ReceptionData, ReceptionPayload} from '~/services/dto/reception-data'
-import type {WeightData} from '~/services/dto/weight-data'
+import { useApi } from '~/composables/useApi'
+import { createWorkflowService } from '~/services/workflow-service'
+import type { ReceptionData, ReceptionPayload } from '~/services/dto/reception-data'
+import type { WeightData } from '~/services/dto/weight-data'
 
-export async function getReceptionList(isValid: boolean|null = null) {
+const service = createWorkflowService<ReceptionData, ReceptionPayload>('receptions', 'reception')
+
+export const getReceptionList = service.getList
+export const getReception = service.get
+export const createReception = service.create
+export const updateReception = service.update
+export const getWeight = service.getWeight as () => Promise<WeightData>
+
+export async function deleteReception(id: number) {
     const api = useApi()
-    const query = isValid !== null ? { isValid: isValid} : {}
-    return api.get<ReceptionData[]>('receptions', query, {
-        toastErrorKey: 'errors.reception.list'
+    return api.delete(`receptions/${id}`, {}, {
+        toastSuccessKey: 'success.reception.delete',
+        toastErrorKey: 'errors.reception.delete'
     })
 }
 
-
-export async function getReception(id: number) {
-    const api = useApi()
-    return api.get<ReceptionData>(`receptions/${id}`, {}, {
-        toastErrorKey: 'errors.reception.fetch'
-    })
-}
-
-export async function createReception(payload: ReceptionPayload = {}) {
-    const api = useApi()
-    return api.post<ReceptionData>('receptions', payload, {
-        toastSuccessKey: 'success.reception.create',
-        toastErrorKey: 'errors.reception.create'
-    })
-}
-
-export async function updateReception(id: number, payload: ReceptionPayload) {
-    const api = useApi()
-    return api.patch<ReceptionData>(`receptions/${id}`, payload, {
-        toastErrorKey: 'errors.reception.update',
-        toastSuccessKey: 'success.reception.update'
-    })
-}
-
-export async function getWeight(): Promise<WeightData> {
-    const api = useApi()
-    return api.get<WeightData>('receptions/weigh', {}, {
-        toastErrorKey: 'errors.reception.weigh'
-    })
-}
+export { service as receptionService }
diff --git a/frontend/services/shipment.ts b/frontend/services/shipment.ts
index d273102..034801b 100644
--- a/frontend/services/shipment.ts
+++ b/frontend/services/shipment.ts
@@ -1,42 +1,22 @@
-import {useApi} from '~/composables/useApi'
-import type {ShipmentData, ShipmentPayload} from '~/services/dto/shipment-data'
-import type {WeightData} from '~/services/dto/weight-data'
+import { createWorkflowService } from '~/services/workflow-service'
+import type { ShipmentData, ShipmentPayload } from '~/services/dto/shipment-data'
+import type { WeightData } from '~/services/dto/weight-data'
 
-export async function getShipmentList(isValid: boolean|null = null) {
+const service = createWorkflowService<ShipmentData, ShipmentPayload>('shipments', 'shipment')
+
+export const getShipmentList = service.getList
+export const getShipment = service.get
+export const createShipment = service.create
+export const updateShipment = service.update
+export const getWeightShipment = service.getWeight as () => Promise<WeightData>
+
+export async function deleteShipment(id: number) {
+    const { useApi } = await import('~/composables/useApi')
     const api = useApi()
-    const query = isValid !== null ? { isValid: isValid} : {}
-    return api.get<ShipmentData[]>('shipments', query, {
-        toastErrorKey: 'errors.shipment.list'
+    return api.delete(`shipments/${id}`, {}, {
+        toastSuccessKey: 'success.shipment.delete',
+        toastErrorKey: 'errors.shipment.delete'
     })
 }
 
-export async function getShipment(id: number) {
-    const api = useApi()
-    return api.get<ShipmentData>(`shipments/${id}`, {}, {
-        toastErrorKey: 'errors.shipment.fetch'
-    })
-}
-
-export async function createShipment(payload: ShipmentPayload = {}) {
-    console.log('test')
-    const api = useApi()
-    return api.post<ShipmentData>('shipments', payload, {
-        toastSuccessKey: 'success.shipment.create',
-        toastErrorKey: 'errors.shipment.create'
-    })
-}
-
-export async function updateShipment(id: number, payload: ShipmentPayload) {
-    const api = useApi()
-    return api.patch<ShipmentData>(`shipments/${id}`, payload, {
-        toastErrorKey: 'errors.shipment.update',
-        toastSuccessKey: 'success.shipment.update'
-    })
-}
-
-export async function getWeightShipment(): Promise<WeightData> {
-    const api = useApi()
-    return api.get<WeightData>('shipments/weigh', {}, {
-        toastErrorKey: 'errors.shipment.weigh'
-    })
-}
+export { service as shipmentService }
diff --git a/frontend/services/weight.ts b/frontend/services/weight.ts
index 6c9243c..10e5527 100644
--- a/frontend/services/weight.ts
+++ b/frontend/services/weight.ts
@@ -1,8 +1,5 @@
 import { useApi } from '~/composables/useApi'
-import type {ReceptionData, ReceptionPayload, WeightEntryData} from '~/services/dto/reception-data'
-import type {Ref} from "vue";
-import type {ShipmentData, ShipmentPayload} from "~/services/dto/shipment-data";
-import type {WeighingMode} from "~/composables/useWeighing";
+import type { WeightEntryData } from '~/services/dto/reception-data'
 
 export type WeightPayload = {
     reception?: string
@@ -13,29 +10,15 @@ export type WeightPayload = {
     weighedAt: string | null
 }
 
-export async function createWeight(payload: WeightPayload) {
+export async function createWeight(payload: WeightPayload | Record<string, any>) {
     const api = useApi()
     return api.post<WeightEntryData>('weights', payload)
 }
 
 export async function updateWeight(id: number, payload: Partial<WeightPayload>) {
     const api = useApi()
-    return api.patch<WeightEntryData>(`weights/${id}`, payload,{
-    toastErrorKey: 'errors.weight.update',
-    toastSuccessKey: 'success.weight.update'
+    return api.patch<WeightEntryData>(`weights/${id}`, payload, {
+        toastErrorKey: 'errors.weight.update',
+        toastSuccessKey: 'success.weight.update'
     })
 }
-
-export type UseWeighingShipmentOptions = {
-    modeShipment: WeighingMode
-    shipment: Ref<ShipmentData | null>
-    updateShipment: (id: number, payload: ShipmentPayload) => Promise<ShipmentData | null>
-    loadShipment?: (id: number) => Promise<ShipmentData | null>
-}
-
-export type UseWeighingOptions = {
-    mode: WeighingMode
-    reception: Ref<ReceptionData | null>
-    updateReception: (id: number, payload: ReceptionPayload) => Promise<ReceptionData | null>
-    loadReception?: (id: number) => Promise<ReceptionData | null>
-}
diff --git a/frontend/services/workflow-service.ts b/frontend/services/workflow-service.ts
new file mode 100644
index 0000000..95b0389
--- /dev/null
+++ b/frontend/services/workflow-service.ts
@@ -0,0 +1,55 @@
+import { useApi } from '~/composables/useApi'
+import type { WeightData } from '~/services/dto/weight-data'
+
+export interface WorkflowService<TEntity, TPayload> {
+    getList: (isValid?: boolean | null) => Promise<TEntity[]>
+    get: (id: number) => Promise<TEntity>
+    create: (payload: TPayload) => Promise<TEntity>
+    update: (id: number, payload: TPayload) => Promise<TEntity>
+    getWeight: () => Promise<WeightData>
+}
+
+export function createWorkflowService<TEntity, TPayload>(
+    apiResource: string,
+    toastPrefix: string
+): WorkflowService<TEntity, TPayload> {
+    const getList = async (isValid: boolean | null = null): Promise<TEntity[]> => {
+        const api = useApi()
+        const query = isValid !== null ? { isValid } : {}
+        return api.get<TEntity[]>(apiResource, query, {
+            toastErrorKey: `errors.${toastPrefix}.list`
+        })
+    }
+
+    const get = async (id: number): Promise<TEntity> => {
+        const api = useApi()
+        return api.get<TEntity>(`${apiResource}/${id}`, {}, {
+            toastErrorKey: `errors.${toastPrefix}.fetch`
+        })
+    }
+
+    const create = async (payload: TPayload): Promise<TEntity> => {
+        const api = useApi()
+        return api.post<TEntity>(apiResource, payload, {
+            toastSuccessKey: `success.${toastPrefix}.create`,
+            toastErrorKey: `errors.${toastPrefix}.create`
+        })
+    }
+
+    const update = async (id: number, payload: TPayload): Promise<TEntity> => {
+        const api = useApi()
+        return api.patch<TEntity>(`${apiResource}/${id}`, payload, {
+            toastErrorKey: `errors.${toastPrefix}.update`,
+            toastSuccessKey: `success.${toastPrefix}.update`
+        })
+    }
+
+    const getWeight = async (): Promise<WeightData> => {
+        const api = useApi()
+        return api.get<WeightData>(`${apiResource}/weigh`, {}, {
+            toastErrorKey: `errors.${toastPrefix}.weigh`
+        })
+    }
+
+    return { getList, get, create, update, getWeight }
+}
diff --git a/frontend/stores/reception.ts b/frontend/stores/reception.ts
index 8d48919..c6812c9 100644
--- a/frontend/stores/reception.ts
+++ b/frontend/stores/reception.ts
@@ -1,59 +1,19 @@
 import { defineStore } from 'pinia'
+import { useWorkflowStoreLogic } from '~/stores/workflow-store'
+import { receptionService } from '~/services/reception'
 import type { ReceptionData, ReceptionPayload } from '~/services/dto/reception-data'
-import { createReception, getReception, updateReception } from '~/services/reception'
 
-const isReceptionData = (value: unknown): value is ReceptionData => {
-  return Boolean(value && typeof value === 'object' && 'id' in value)
-}
+export const useReceptionStore = defineStore('reception', () => {
+    const { current, isLoading, setCurrent, clearCurrent, load, create, update } =
+        useWorkflowStoreLogic<ReceptionData, ReceptionPayload>(receptionService)
 
-export const useReceptionStore = defineStore('reception', {
-  state: () => ({
-    current: null as ReceptionData | null,
-    isLoading: false
-  }),
-  actions: {
-    setCurrent(reception: ReceptionData | null) {
-      this.current = reception
-    },
-    clearCurrent() {
-      this.current = null
-    },
-    async loadReception(id: number) {
-      this.isLoading = true
-      const result = await getReception(id).finally(() => {
-        this.isLoading = false
-      })
-      if (!isReceptionData(result)) {
-        this.current = null
-        return null
-      }
-
-      this.current = result
-      return result
-    },
-    async createReception(payload: ReceptionPayload = {}) {
-      this.isLoading = true
-      const result = await createReception(payload).finally(() => {
-        this.isLoading = false
-      })
-      if (!isReceptionData(result)) {
-        return null
-      }
-
-      this.current = result
-      return result
-    },
-    async updateReception(id: number, payload: ReceptionPayload) {
-      this.isLoading = true
-      const result = await updateReception(id, payload).finally(() => {
-        this.isLoading = false
-      })
-      if (!isReceptionData(result)) {
-        return null
-      }
-
-      this.current = result
-      return result
+    return {
+        current,
+        isLoading,
+        setCurrent,
+        clearCurrent,
+        loadReception: load,
+        createReception: create,
+        updateReception: update
     }
-  }
 })
diff --git a/frontend/stores/shipment.ts b/frontend/stores/shipment.ts
index a92b919..6342c0a 100644
--- a/frontend/stores/shipment.ts
+++ b/frontend/stores/shipment.ts
@@ -1,58 +1,19 @@
 import { defineStore } from 'pinia'
-import type {ShipmentData, ShipmentPayload} from "~/services/dto/shipment-data";
-import {createShipment, getShipment, updateShipment} from "~/services/shipment";
+import { useWorkflowStoreLogic } from '~/stores/workflow-store'
+import { shipmentService } from '~/services/shipment'
+import type { ShipmentData, ShipmentPayload } from '~/services/dto/shipment-data'
 
-const isShipmentData = (value: unknown): value is ShipmentData => {
-    return Boolean(value && typeof value === 'object' && 'id' in value)
-}
-export const useShipmentStore = defineStore('shipment', {
-    state: () => ({
-        current: null as ShipmentData | null,
-        isLoading: false
-    }),
-    actions: {
-        setCurrent(shipment: ShipmentData | null) {
-            this.current = shipment
-        },
-        clearCurrent() {
-            this.current = null
-        },
-        async loadShipment(id: number) {
-            this.isLoading = true
-            const result = await getShipment(id).finally(() => {
-                this.isLoading = false
-            })
-            if (!isShipmentData(result)) {
-                this.current = null
-                return null
-            }
+export const useShipmentStore = defineStore('shipment', () => {
+    const { current, isLoading, setCurrent, clearCurrent, load, create, update } =
+        useWorkflowStoreLogic<ShipmentData, ShipmentPayload>(shipmentService)
 
-            this.current = result
-            return result
-        },
-        async createShipment(payload: ShipmentPayload = {}) {
-            this.isLoading = true
-            const result = await createShipment(payload).finally(() => {
-                this.isLoading = false
-            })
-            if (!isShipmentData(result)) {
-                return null
-            }
-
-            this.current = result
-            return result
-        },
-        async updateShipment(id: number, payload: ShipmentPayload) {
-            this.isLoading = true
-            const result = await updateShipment(id, payload).finally(() => {
-                this.isLoading = false
-            })
-            if (!isShipmentData(result)) {
-                return null
-            }
-
-            this.current = result
-            return result
-        }
+    return {
+        current,
+        isLoading,
+        setCurrent,
+        clearCurrent,
+        loadShipment: load,
+        createShipment: create,
+        updateShipment: update
     }
 })
diff --git a/frontend/stores/workflow-store.ts b/frontend/stores/workflow-store.ts
new file mode 100644
index 0000000..c0e8dd4
--- /dev/null
+++ b/frontend/stores/workflow-store.ts
@@ -0,0 +1,59 @@
+import type { WorkflowService } from '~/services/workflow-service'
+
+const isEntityData = (value: unknown): value is { id: number } => {
+    return Boolean(value && typeof value === 'object' && 'id' in value)
+}
+
+export function useWorkflowStoreLogic<TEntity extends { id: number }, TPayload>(
+    service: WorkflowService<TEntity, TPayload>
+) {
+    const current = ref<TEntity | null>(null)
+    const isLoading = ref(false)
+
+    const setCurrent = (entity: TEntity | null) => {
+        current.value = entity
+    }
+
+    const clearCurrent = () => {
+        current.value = null
+    }
+
+    const load = async (id: number) => {
+        isLoading.value = true
+        const result = await service.get(id).finally(() => {
+            isLoading.value = false
+        })
+        if (!isEntityData(result)) {
+            current.value = null
+            return null
+        }
+        current.value = result as any
+        return result
+    }
+
+    const create = async (payload: TPayload) => {
+        isLoading.value = true
+        const result = await service.create(payload).finally(() => {
+            isLoading.value = false
+        })
+        if (!isEntityData(result)) {
+            return null
+        }
+        current.value = result as any
+        return result
+    }
+
+    const update = async (id: number, payload: TPayload) => {
+        isLoading.value = true
+        const result = await service.update(id, payload).finally(() => {
+            isLoading.value = false
+        })
+        if (!isEntityData(result)) {
+            return null
+        }
+        current.value = result as any
+        return result
+    }
+
+    return { current, isLoading, setCurrent, clearCurrent, load, create, update }
+}
diff --git a/frontend/types/workflow.ts b/frontend/types/workflow.ts
new file mode 100644
index 0000000..63363eb
--- /dev/null
+++ b/frontend/types/workflow.ts
@@ -0,0 +1,48 @@
+import type { WeightEntryData } from '~/services/dto/reception-data'
+import type { CarrierData } from '~/services/dto/carrier-data'
+import type { TruckData } from '~/services/dto/truck-data'
+import type { UserData } from '~/services/dto/user-data'
+import type { AddressData } from '~/services/dto/address-data'
+import type { DriverData } from '~/services/dto/driver-data'
+
+export interface WorkflowEntity {
+    id: number
+    identificationNumber?: string | null
+    licensePlate: string | null
+    currentStep: number
+    isValid: boolean
+    weights?: WeightEntryData[] | null
+    carrier?: CarrierData | null
+    truck?: TruckData | null
+    user?: UserData | null
+    address?: AddressData | null
+    driver?: DriverData | null
+}
+
+export interface WorkflowPayload {
+    licensePlate?: string | null
+    currentStep?: number
+    isValid?: boolean
+    carrier?: string | null
+    truck?: string | null
+    user?: string | null
+    address?: string | null
+    driver?: string | null
+}
+
+export interface StepDefinition {
+    label: string
+    weighingMode?: 'gross' | 'tare'
+    isFinal?: boolean
+}
+
+export interface WorkflowConfig {
+    entityName: 'reception' | 'shipment'
+    apiResource: string
+    steps: StepDefinition[]
+    weighingLabels: Record<'gross' | 'tare', string>
+    buildReceiptFilename: (entity: WorkflowEntity) => string
+    routePrefix: string
+    toastPrefix: string
+    dateField: string
+}
diff --git a/migrations/Version20260318103644.php b/migrations/Version20260318103644.php
new file mode 100644
index 0000000..a47189e
--- /dev/null
+++ b/migrations/Version20260318103644.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260318103644 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE address ALTER label DROP NOT NULL');
+        $this->addSql('ALTER INDEX idx_ea9e2a42f8d859df RENAME TO IDX_2068337FF8D859DF');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE address ALTER label SET NOT NULL');
+        $this->addSql('ALTER INDEX idx_2068337ff8d859df RENAME TO idx_ea9e2a42f8d859df');
+    }
+}
diff --git a/migrations/Version20260318104205.php b/migrations/Version20260318104205.php
new file mode 100644
index 0000000..d4cda1c
--- /dev/null
+++ b/migrations/Version20260318104205.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260318104205 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE customer ADD created_by INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE customer ADD CONSTRAINT FK_81398E09DE12AB56 FOREIGN KEY (created_by) REFERENCES public."user" (id) NOT DEFERRABLE');
+        $this->addSql('CREATE INDEX IDX_81398E09DE12AB56 ON customer (created_by)');
+        $this->addSql('ALTER TABLE supplier ADD created_by INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE supplier ADD CONSTRAINT FK_9B2A6C7EDE12AB56 FOREIGN KEY (created_by) REFERENCES public."user" (id) NOT DEFERRABLE');
+        $this->addSql('CREATE INDEX IDX_9B2A6C7EDE12AB56 ON supplier (created_by)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE customer DROP CONSTRAINT FK_81398E09DE12AB56');
+        $this->addSql('DROP INDEX IDX_81398E09DE12AB56');
+        $this->addSql('ALTER TABLE customer DROP created_by');
+        $this->addSql('ALTER TABLE supplier DROP CONSTRAINT FK_9B2A6C7EDE12AB56');
+        $this->addSql('DROP INDEX IDX_9B2A6C7EDE12AB56');
+        $this->addSql('ALTER TABLE supplier DROP created_by');
+    }
+}
diff --git a/src/Command/SeedCommand.php b/src/Command/SeedCommand.php
index bb64d7c..0c25b59 100644
--- a/src/Command/SeedCommand.php
+++ b/src/Command/SeedCommand.php
@@ -545,7 +545,6 @@ class SeedCommand extends Command
                 'phone'     => '05.49.20.09.10',
                 'addresses' => [
                     [
-                        'label'       => 'LIOT CHATELLERAULT',
                         'street'      => "14 Allée d'Argenson",
                         'street2'     => 'ZI Nord',
                         'postalCode'  => '86100',
@@ -560,7 +559,6 @@ class SeedCommand extends Command
                 'phone'     => '05.49.02.65.27',
                 'addresses' => [
                     [
-                        'label'       => 'ARNAULT EURL',
                         'street'      => 'Moulin du Guéret',
                         'street2'     => 'B.P 30425',
                         'postalCode'  => '86100',
@@ -575,7 +573,6 @@ class SeedCommand extends Command
                 'phone'     => '06.80.14.18.82',
                 'addresses' => [
                     [
-                        'label'       => 'EARL DES GONNIERES',
                         'street'      => "27 Route d'Ingrandes",
                         'street2'     => 'Les Gonnières',
                         'postalCode'  => '86220',
@@ -590,7 +587,6 @@ class SeedCommand extends Command
                 'phone'     => '05.49.86.17.95',
                 'addresses' => [
                     [
-                        'label'       => 'EARL LESIGNY BABY',
                         'street'      => '2 Lieu Dit Les Bouquins',
                         'street2'     => null,
                         'postalCode'  => '86270',
@@ -605,7 +601,6 @@ class SeedCommand extends Command
                 'phone'     => '03.85.24.25.50',
                 'addresses' => [
                     [
-                        'label'       => 'FEDER',
                         'street'      => 'Molaise',
                         'street2'     => null,
                         'postalCode'  => '71120',
@@ -620,7 +615,6 @@ class SeedCommand extends Command
                 'phone'     => '05.49.86.57.24',
                 'addresses' => [
                     [
-                        'label'       => "GAEC DE L'ESPOIR",
                         'street'      => 'La Moujonnerie',
                         'street2'     => null,
                         'postalCode'  => '86450',
@@ -635,7 +629,6 @@ class SeedCommand extends Command
                 'phone'     => '05.49.23.51.66',
                 'addresses' => [
                     [
-                        'label'       => 'GRAVELEAU',
                         'street'      => '3, Le Jeu',
                         'street2'     => null,
                         'postalCode'  => '86220',
@@ -650,7 +643,6 @@ class SeedCommand extends Command
                 'phone'     => '05.49.52.77.10',
                 'addresses' => [
                     [
-                        'label'       => 'LORTHOLARY',
                         'street'      => 'Ferme de Geniec',
                         'street2'     => null,
                         'postalCode'  => '86550',
@@ -665,7 +657,6 @@ class SeedCommand extends Command
                 'phone'     => '05.65.67.89.46',
                 'addresses' => [
                     [
-                        'label'       => 'NATERA',
                         'street'      => 'Bd des Balquières',
                         'street2'     => 'BP 3220',
                         'postalCode'  => '12032',
@@ -675,12 +666,11 @@ class SeedCommand extends Command
                 ],
             ],
             [
-                'name'      => 'SCEA des Bariollières',
+                'name'      => 'SCEA DES BARIOLLIÈRES',
                 'email'     => 'elisregnier@gmail.com',
                 'phone'     => '06.09.37.65.61',
                 'addresses' => [
                     [
-                        'label'       => 'SCEA des Bariollières',
                         'street'      => '2 rue des Barriollières',
                         'street2'     => null,
                         'postalCode'  => '86220',
@@ -695,7 +685,6 @@ class SeedCommand extends Command
                 'phone'     => null,
                 'addresses' => [
                     [
-                        'label'       => 'SCEA SENE',
                         'street'      => '3 Route de la Roche Posay',
                         'street2'     => 'Les Girouettes',
                         'postalCode'  => '86100',
@@ -710,7 +699,6 @@ class SeedCommand extends Command
                 'phone'     => '02.51.67.17.98',
                 'addresses' => [
                     [
-                        'label'       => 'TERRENA',
                         'street'      => 'La Blanchardière',
                         'street2'     => null,
                         'postalCode'  => '44522',
@@ -725,7 +713,6 @@ class SeedCommand extends Command
                 'phone'     => '05.49.19.44.33',
                 'addresses' => [
                     [
-                        'label'       => 'TRICHERIE COOPERATIVE',
                         'street'      => 'B.P n°2',
                         'street2'     => null,
                         'postalCode'  => '86490',
@@ -735,12 +722,11 @@ class SeedCommand extends Command
                 ],
             ],
             [
-                'name'      => 'TURPAULT Muriel',
+                'name'      => 'TURPAULT MURIEL',
                 'email'     => null,
                 'phone'     => null,
                 'addresses' => [
                     [
-                        'label'       => 'TURPAULT Muriel',
                         'street'      => '23Bis Rue Marcel Pagnol',
                         'street2'     => null,
                         'postalCode'  => '86100',
@@ -755,7 +741,6 @@ class SeedCommand extends Command
                 'phone'     => '0675446004',
                 'addresses' => [
                     [
-                        'label'       => 'EARL DE LA MENAUDIERE',
                         'street'      => '1 la menaudière',
                         'street2'     => null,
                         'postalCode'  => '86450',
@@ -770,7 +755,6 @@ class SeedCommand extends Command
                 'phone'     => '0675030304',
                 'addresses' => [
                     [
-                        'label'       => 'SARL ERBS',
                         'street'      => 'les rodières ',
                         'street2'     => null,
                         'postalCode'  => '86230',
@@ -811,7 +795,6 @@ class SeedCommand extends Command
                 'email'     => 'eurl.arnault86@orange.fr',
                 'addresses' => [
                     [
-                        'label'       => 'ARNAULT EURL',
                         'street'      => 'Moulin du Guéret',
                         'street2'     => 'B.P 30425',
                         'postalCode'  => '86100',
@@ -826,7 +809,6 @@ class SeedCommand extends Command
                 'email'     => 'sandra.robineaux@covilim.com',
                 'addresses' => [
                     [
-                        'label'       => 'COVILIM',
                         'street'      => 'Rue de Nexon',
                         'street2'     => null,
                         'postalCode'  => '87000',
@@ -836,12 +818,11 @@ class SeedCommand extends Command
                 ],
             ],
             [
-                'name'      => 'Les producteurs de la marche (LPM)',
+                'name'      => 'LES PRODUCTEURS DE LA MARCHE (LPM)',
                 'phone'     => '05.55.63.04.53',
                 'email'     => 'f.legalliard@lpmcoop.fr',
                 'addresses' => [
                     [
-                        'label'       => 'Les producteurs de la marche (LPM)',
                         'street'      => 'Malonze',
                         'street2'     => null,
                         'postalCode'  => '23300',
@@ -856,7 +837,6 @@ class SeedCommand extends Command
                 'email'     => 'contact86@lortholarybetail.com',
                 'addresses' => [
                     [
-                        'label'       => 'LORTHOLARY BETAIL',
                         'street'      => 'FERME DE GENIEC',
                         'street2'     => null,
                         'postalCode'  => '86550',
@@ -871,7 +851,6 @@ class SeedCommand extends Command
                 'email'     => 'scouillaud@terrena.fr',
                 'addresses' => [
                     [
-                        'label'       => 'TERRENA',
                         'street'      => 'LA NOELLE',
                         'street2'     => 'BP 20199',
                         'postalCode'  => '44155',
@@ -961,7 +940,7 @@ class SeedCommand extends Command
     {
         $addressRepo = $this->entityManager->getRepository(Address::class);
         $address     = $addressRepo->findOneBy([
-            'label'      => $addressData['label'],
+            'street'     => $addressData['street'],
             'postalCode' => $addressData['postalCode'],
         ]);
         if (!$address) {
@@ -971,7 +950,6 @@ class SeedCommand extends Command
             ++$this->updated;
         }
         $address
-            ->setLabel($addressData['label'])
             ->setStreet($addressData['street'])
             ->setStreet2($addressData['street2'])
             ->setPostalCode($addressData['postalCode'])
diff --git a/src/DataFixtures/ReferenceFixtures.php b/src/DataFixtures/ReferenceFixtures.php
index f6cbb15..245af1f 100644
--- a/src/DataFixtures/ReferenceFixtures.php
+++ b/src/DataFixtures/ReferenceFixtures.php
@@ -108,7 +108,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '05.49.20.09.10',
                 'addresses' => [
                     [
-                        'label'       => 'LIOT CHATELLERAULT',
                         'street'      => "14 Allée d'Argenson",
                         'street2'     => 'ZI Nord',
                         'postalCode'  => '86100',
@@ -123,7 +122,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '05.49.02.65.27',
                 'addresses' => [
                     [
-                        'label'       => 'ARNAULT EURL',
                         'street'      => 'Moulin du Guéret',
                         'street2'     => 'B.P 30425',
                         'postalCode'  => '86100',
@@ -138,7 +136,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '06.80.14.18.82',
                 'addresses' => [
                     [
-                        'label'       => 'EARL DES GONNIERES',
                         'street'      => "27 Route d'Ingrandes",
                         'street2'     => 'Les Gonnières',
                         'postalCode'  => '86220',
@@ -153,7 +150,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '05.49.86.17.95',
                 'addresses' => [
                     [
-                        'label'       => 'EARL LESIGNY BABY',
                         'street'      => '2 Lieu Dit Les Bouquins',
                         'street2'     => null,
                         'postalCode'  => '86270',
@@ -168,7 +164,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '03.85.24.25.50',
                 'addresses' => [
                     [
-                        'label'       => 'FEDER',
                         'street'      => 'Molaise',
                         'street2'     => null,
                         'postalCode'  => '71120',
@@ -183,7 +178,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '05.49.86.57.24',
                 'addresses' => [
                     [
-                        'label'       => "GAEC DE L'ESPOIR",
                         'street'      => 'La Moujonnerie',
                         'street2'     => null,
                         'postalCode'  => '86450',
@@ -198,7 +192,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '05.49.23.51.66',
                 'addresses' => [
                     [
-                        'label'       => 'GRAVELEAU',
                         'street'      => '3, Le Jeu',
                         'street2'     => null,
                         'postalCode'  => '86220',
@@ -213,7 +206,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '05.49.52.77.10',
                 'addresses' => [
                     [
-                        'label'       => 'LORTHOLARY',
                         'street'      => 'Ferme de Geniec',
                         'street2'     => null,
                         'postalCode'  => '86550',
@@ -228,7 +220,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '05.65.67.89.46',
                 'addresses' => [
                     [
-                        'label'       => 'NATERA',
                         'street'      => 'Bd des Balquières',
                         'street2'     => 'BP 3220',
                         'postalCode'  => '12032',
@@ -238,12 +229,11 @@ class ReferenceFixtures extends Fixture
                 ],
             ],
             [
-                'name'      => 'SCEA des Bariollières',
+                'name'      => 'SCEA DES BARIOLLIÈRES',
                 'email'     => 'elisregnier@gmail.com',
                 'phone'     => '06.09.37.65.61',
                 'addresses' => [
                     [
-                        'label'       => 'SCEA des Bariollières',
                         'street'      => '2 rue des Barriollières',
                         'street2'     => null,
                         'postalCode'  => '86220',
@@ -258,7 +248,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => null,
                 'addresses' => [
                     [
-                        'label'       => 'SCEA SENE',
                         'street'      => '3 Route de la Roche Posay',
                         'street2'     => 'Les Girouettes',
                         'postalCode'  => '86100',
@@ -273,7 +262,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '02.51.67.17.98',
                 'addresses' => [
                     [
-                        'label'       => 'TERRENA',
                         'street'      => 'La Blanchardière',
                         'street2'     => null,
                         'postalCode'  => '44522',
@@ -288,7 +276,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '05.49.19.44.33',
                 'addresses' => [
                     [
-                        'label'       => 'TRICHERIE COOPERATIVE',
                         'street'      => 'B.P n°2',
                         'street2'     => null,
                         'postalCode'  => '86490',
@@ -298,12 +285,11 @@ class ReferenceFixtures extends Fixture
                 ],
             ],
             [
-                'name'      => 'TURPAULT Muriel',
+                'name'      => 'TURPAULT MURIEL',
                 'email'     => null,
                 'phone'     => null,
                 'addresses' => [
                     [
-                        'label'       => 'TURPAULT Muriel',
                         'street'      => '23Bis Rue Marcel Pagnol',
                         'street2'     => null,
                         'postalCode'  => '86100',
@@ -318,7 +304,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '0675446004',
                 'addresses' => [
                     [
-                        'label'       => 'EARL DE LA MENAUDIERE',
                         'street'      => '1 la menaudière',
                         'street2'     => null,
                         'postalCode'  => '86450',
@@ -333,7 +318,6 @@ class ReferenceFixtures extends Fixture
                 'phone'     => '0675030304',
                 'addresses' => [
                     [
-                        'label'       => 'SARL ERBS',
                         'street'      => 'les rodières ',
                         'street2'     => null,
                         'postalCode'  => '86230',
@@ -352,10 +336,9 @@ class ReferenceFixtures extends Fixture
             ;
 
             foreach ($supplierData['addresses'] as $addressData) {
-                $addressKey = sprintf('%s|%s', $addressData['label'], $addressData['postalCode']);
+                $addressKey = sprintf('%s|%s', $addressData['street'], $addressData['postalCode']);
                 if (!isset($addressIndex[$addressKey])) {
                     $addressIndex[$addressKey] = new Address()
-                        ->setLabel($addressData['label'])
                         ->setStreet($addressData['street'])
                         ->setStreet2($addressData['street2'])
                         ->setPostalCode($addressData['postalCode'])
@@ -378,7 +361,6 @@ class ReferenceFixtures extends Fixture
                 'email'     => 'eurl.arnault86@orange.fr',
                 'addresses' => [
                     [
-                        'label'       => 'ARNAULT EURL',
                         'street'      => 'Moulin du Guéret',
                         'street2'     => 'B.P 30425',
                         'postalCode'  => '86100',
@@ -393,7 +375,6 @@ class ReferenceFixtures extends Fixture
                 'email'     => 'sandra.robineaux@covilim.com',
                 'addresses' => [
                     [
-                        'label'       => 'COVILIM',
                         'street'      => 'Rue de Nexon',
                         'street2'     => null,
                         'postalCode'  => '87000',
@@ -403,12 +384,11 @@ class ReferenceFixtures extends Fixture
                 ],
             ],
             [
-                'name'      => 'Les producteurs de la marche (LPM)',
+                'name'      => 'LES PRODUCTEURS DE LA MARCHE (LPM)',
                 'phone'     => '05.55.63.04.53',
                 'email'     => 'f.legalliard@lpmcoop.fr',
                 'addresses' => [
                     [
-                        'label'       => 'Les producteurs de la marche (LPM)',
                         'street'      => 'Malonze',
                         'street2'     => null,
                         'postalCode'  => '23300',
@@ -423,7 +403,6 @@ class ReferenceFixtures extends Fixture
                 'email'     => 'contact86@lortholarybetail.com',
                 'addresses' => [
                     [
-                        'label'       => 'LORTHOLARY BETAIL',
                         'street'      => 'FERME DE GENIEC',
                         'street2'     => null,
                         'postalCode'  => '86550',
@@ -438,7 +417,6 @@ class ReferenceFixtures extends Fixture
                 'email'     => 'scouillaud@terrena.fr',
                 'addresses' => [
                     [
-                        'label'       => 'TERRENA',
                         'street'      => 'LA NOELLE',
                         'street2'     => 'BP 20199',
                         'postalCode'  => '44155',
@@ -457,10 +435,9 @@ class ReferenceFixtures extends Fixture
             ;
 
             foreach ($customerData['addresses'] as $addressData) {
-                $addressKey = sprintf('%s|%s', $addressData['label'], $addressData['postalCode']);
+                $addressKey = sprintf('%s|%s', $addressData['street'], $addressData['postalCode']);
                 if (!isset($addressIndex[$addressKey])) {
                     $addressIndex[$addressKey] = new Address()
-                        ->setLabel($addressData['label'])
                         ->setStreet($addressData['street'])
                         ->setStreet2($addressData['street2'])
                         ->setPostalCode($addressData['postalCode'])
diff --git a/src/Entity/Address.php b/src/Entity/Address.php
index b0cc38c..8f0507c 100644
--- a/src/Entity/Address.php
+++ b/src/Entity/Address.php
@@ -46,9 +46,9 @@ class Address
     #[Groups(['address:read', 'supplier:read', 'customer:read', 'shipment:read'])]
     private ?int $id = null;
 
-    #[ORM\Column(length: 120)]
-    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read', 'address:write'])]
-    private string $label = '';
+    #[ORM\Column(length: 120, nullable: true)]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read'])]
+    private ?string $label = null;
 
     #[ORM\Column(length: 180)]
     #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read', 'address:write'])]
@@ -93,12 +93,12 @@ class Address
         return $this->id;
     }
 
-    public function getLabel(): string
+    public function getLabel(): ?string
     {
         return $this->label;
     }
 
-    public function setLabel(string $label): self
+    public function setLabel(?string $label): self
     {
         $this->label = $label;
 
diff --git a/src/Entity/Carrier.php b/src/Entity/Carrier.php
index e569864..befd88c 100644
--- a/src/Entity/Carrier.php
+++ b/src/Entity/Carrier.php
@@ -67,7 +67,7 @@ class Carrier
 
     public function setName(string $name): self
     {
-        $this->name = $name;
+        $this->name = mb_strtoupper($name);
 
         return $this;
     }
diff --git a/src/Entity/Customer.php b/src/Entity/Customer.php
index 9c430a7..b14e427 100644
--- a/src/Entity/Customer.php
+++ b/src/Entity/Customer.php
@@ -59,6 +59,11 @@ class Customer
     #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
     private ?string $phone = null;
 
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(name: 'created_by', nullable: true)]
+    #[Groups(['customer:read', 'customer:write'])]
+    private ?User $createdBy = null;
+
     /**
      * @var Collection<int, Address>
      */
@@ -85,7 +90,7 @@ class Customer
 
     public function setName(string $name): self
     {
-        $this->name = $name;
+        $this->name = mb_strtoupper($name);
 
         return $this;
     }
@@ -114,6 +119,18 @@ class Customer
         return $this;
     }
 
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    public function setCreatedBy(?User $createdBy): self
+    {
+        $this->createdBy = $createdBy;
+
+        return $this;
+    }
+
     public function getAddresses(): Collection
     {
         return $this->addresses;
diff --git a/src/Entity/Reception.php b/src/Entity/Reception.php
index 66305a0..2ef4dec 100644
--- a/src/Entity/Reception.php
+++ b/src/Entity/Reception.php
@@ -8,6 +8,7 @@ use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter;
 use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Delete;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\Patch;
@@ -47,6 +48,9 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
             normalizationContext: ['groups' => ['reception:read']],
             denormalizationContext: ['groups' => ['reception:write']],
         ),
+        new Delete(
+            requirements: ['id' => '\d+'],
+        ),
         new Get(
             uriTemplate: '/receptions/weigh',
             openapi: new OpenApiOperation(
@@ -96,7 +100,10 @@ class Reception
 
     #[ORM\Column(name: 'date_reception', type: 'datetime_immutable')]
     #[Groups(['reception:read', 'reception:write', 'reception-bovine:read'])]
-    #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
+    #[Context(
+        normalizationContext: [DateTimeNormalizer::FORMAT_KEY => 'Y-m-d H:i'],
+        denormalizationContext: [DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'],
+    )]
     private ?DateTimeImmutable $receptionDate = null;
 
     #[ORM\Column(length: 255, nullable: true)]
@@ -259,6 +266,14 @@ class Reception
 
     public function setReceptionDate(?DateTimeImmutable $receptionDate): self
     {
+        if (null !== $receptionDate && null !== $this->receptionDate) {
+            // Préserve l'heure existante quand seule la date est mise à jour
+            $receptionDate = $receptionDate->setTime(
+                (int) $this->receptionDate->format('H'),
+                (int) $this->receptionDate->format('i'),
+                (int) $this->receptionDate->format('s'),
+            );
+        }
         $this->receptionDate = $receptionDate;
 
         return $this;
@@ -457,8 +472,16 @@ class Reception
     #[ORM\PrePersist]
     public function initializeReceptionDate(): void
     {
+        $now = new DateTimeImmutable();
         if (null === $this->receptionDate) {
-            $this->receptionDate = new DateTimeImmutable();
+            $this->receptionDate = $now;
+        } else {
+            // Préserve la date choisie mais utilise l'heure courante
+            $this->receptionDate = $this->receptionDate->setTime(
+                (int) $now->format('H'),
+                (int) $now->format('i'),
+                (int) $now->format('s'),
+            );
         }
     }
 
diff --git a/src/Entity/Shipment.php b/src/Entity/Shipment.php
index a13f89c..7281a66 100644
--- a/src/Entity/Shipment.php
+++ b/src/Entity/Shipment.php
@@ -8,6 +8,7 @@ use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter;
 use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Delete;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\Patch;
@@ -47,6 +48,9 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
             normalizationContext: ['groups' => ['shipment:read']],
             denormalizationContext: ['groups' => ['shipment:write']],
         ),
+        new Delete(
+            requirements: ['id' => '\d+'],
+        ),
         new Get(
             uriTemplate: '/shipments/weigh',
             openapi: new OpenApiOperation(
@@ -102,7 +106,10 @@ class Shipment
 
     #[ORM\Column(name: 'shipment_date', type: 'datetime_immutable')]
     #[Groups(['shipment:read', 'shipment:write'])]
-    #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
+    #[Context(
+        normalizationContext: [DateTimeNormalizer::FORMAT_KEY => 'Y-m-d H:i'],
+        denormalizationContext: [DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'],
+    )]
     private ?DateTimeImmutable $shipmentDate = null;
 
     #[ORM\ManyToOne]
@@ -245,6 +252,13 @@ class Shipment
 
     public function setShipmentDate(?DateTimeImmutable $shipmentDate): void
     {
+        if (null !== $shipmentDate && null !== $this->shipmentDate) {
+            $shipmentDate = $shipmentDate->setTime(
+                (int) $this->shipmentDate->format('H'),
+                (int) $this->shipmentDate->format('i'),
+                (int) $this->shipmentDate->format('s'),
+            );
+        }
         $this->shipmentDate = $shipmentDate;
     }
 
@@ -303,6 +317,21 @@ class Shipment
         }
     }
 
+    #[ORM\PrePersist]
+    public function initializeShipmentDate(): void
+    {
+        $now = new DateTimeImmutable();
+        if (null === $this->shipmentDate) {
+            $this->shipmentDate = $now;
+        } else {
+            $this->shipmentDate = $this->shipmentDate->setTime(
+                (int) $now->format('H'),
+                (int) $now->format('i'),
+                (int) $now->format('s'),
+            );
+        }
+    }
+
     #[ORM\PostPersist]
     public function initializeIdentificationNumber(PostPersistEventArgs $args): void
     {
diff --git a/src/Entity/Supplier.php b/src/Entity/Supplier.php
index 6ed64da..318a61a 100644
--- a/src/Entity/Supplier.php
+++ b/src/Entity/Supplier.php
@@ -61,6 +61,11 @@ class Supplier
     #[Groups(['supplier:read', 'reception:read', 'supplier:write'])]
     private ?string $phone = null;
 
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(name: 'created_by', nullable: true)]
+    #[Groups(['supplier:read', 'supplier:write'])]
+    private ?User $createdBy = null;
+
     /**
      * @var Collection<int, Address>
      */
@@ -87,7 +92,7 @@ class Supplier
 
     public function setName(string $name): self
     {
-        $this->name = $name;
+        $this->name = mb_strtoupper($name);
 
         return $this;
     }
@@ -116,6 +121,18 @@ class Supplier
         return $this;
     }
 
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    public function setCreatedBy(?User $createdBy): self
+    {
+        $this->createdBy = $createdBy;
+
+        return $this;
+    }
+
     /**
      * @return Collection<int, Address>
      */
diff --git a/src/Entity/User.php b/src/Entity/User.php
index f45ccd6..2427f0d 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -61,11 +61,11 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column(type: 'integer')]
-    #[Groups(['user:read', 'user-login:read', 'reception:read', 'shipment:read'])]
+    #[Groups(['user:read', 'user-login:read', 'reception:read', 'shipment:read', 'supplier:read', 'customer:read'])]
     private ?int $id = null;
 
     #[ORM\Column(length: 180, unique: true)]
-    #[Groups(['user:read', 'user:write', 'user-login:read', 'reception:read', 'shipment:read'])]
+    #[Groups(['user:read', 'user:write', 'user-login:read', 'reception:read', 'shipment:read', 'supplier:read', 'customer:read'])]
     private string $username = '';
 
     #[ORM\Column(type: 'json')]