feat : creation du composant datatable (WIP)

Merge branch 'refs/heads/develop' into feat/266-creation-composant-datatable
2026-02-18 14:54:18 +01:00 · 2026-02-18 08:05:12 +01:00 · 2026-02-17 14:52:23 +01:00 · 2026-02-17 08:20:23 +01:00 · 2026-02-17 08:11:41 +01:00 · 2026-02-16 16:05:04 +01:00
137 changed files with 3900 additions and 7686 deletions
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -1,10 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(npm run:*)",
-      "WebFetch(domain:geo.api.gouv.fr)",
-      "Bash(pip3 install:*)",
-      "Bash(python3 -c \":*)"
-    ]
-  }
-}
--- a/.gitea/workflows/release-artefact.yml
+++ b/.gitea/workflows/release-artefact.yml
@@ -36,7 +36,7 @@ jobs:
        run: |
          cd frontend
          npm ci
-          CI=1 NUXT_TELEMETRY_DISABLED=1 NUXT_PUBLIC_API_BASE=/api NUXT_PUBLIC_APP_BASE=/ NUXT_PUBLIC_GEO_API_BASE=https://geo.api.gouv.fr npm run generate
+          CI=1 NUXT_TELEMETRY_DISABLED=1 NUXT_PUBLIC_API_BASE=/api NUXT_PUBLIC_APP_BASE=/ npm run generate
          test -f .output/public/index.html

      - name: Build artefact
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="ferme" uuid="f407a514-c6b4-4b26-9555-445a85892502">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://localhost:5432/ferme</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="Ferme recette" uuid="ae622167-c834-4e7b-87a5-c1721036f5dc">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://localhost:5432/postgres</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>
--- a/.idea/db-forest-config.xml
+++ b/.idea/db-forest-config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="db-tree-configuration">
-    <option name="data" value="----------------------------------------&#10;1:0:f407a514-c6b4-4b26-9555-445a85892502&#10;2:0:ae622167-c834-4e7b-87a5-c1721036f5dc&#10;3:0:9cad43df-2147-4989-b7a4-443067034884&#10;4:0:09e221b8-067a-488b-9c1d-4e155a333079&#10;" />
+    <option name="data" value="----------------------------------------&#10;1:0:f407a514-c6b4-4b26-9555-445a85892502&#10;2:0:ae622167-c834-4e7b-87a5-c1721036f5dc&#10;" />
  </component>
 </project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,10 @@
    <option name="autoReloadType" value="SELECTIVE" />
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : order récéption/expédition + correction style bouton récéption">
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : corrections diverses">
+      <change beforePath="$PROJECT_DIR$/.idea/data_source_mapping.xml" beforeDir="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$/templates/reception_voucher.html.twig" beforeDir="false" afterPath="$PROJECT_DIR$/templates/reception_voucher.html.twig" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -30,16 +30,16 @@
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
+        <option value="Vue Composition API Component" />
        <option value="TypeScript File" />
        <option value="PHP File" />
-        <option value="Vue Composition API Component" />
      </list>
    </option>
  </component>
  <component name="Git.Settings">
    <option name="RECENT_BRANCH_BY_REPOSITORY">
      <map>
-        <entry key="$PROJECT_DIR$" value="feat/327-voir-modifier-une-expedition-terminee" />
+        <entry key="$PROJECT_DIR$" value="feat/276-lister-expeditions-terminees" />
      </map>
    </option>
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -230,14 +230,14 @@
    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;develop&quot;,
-    &quot;last_opened_file_path&quot;: &quot;//wsl.localhost/Ubuntu-24.04/home/m-tristan/workspace/Ferme&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;fix/325-corrections-diverses&quot;,
+    &quot;last_opened_file_path&quot;: &quot;//wsl.localhost/Ubuntu-24.04/home/kevin/Stage/Ferme/frontend/pages/shipment&quot;,
    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;advanced.settings&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
    &quot;ts.external.directory.path&quot;: &quot;/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  },
@@ -255,28 +255,25 @@
 }</component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
-      <recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
-      <recent name="$PROJECT_DIR$/frontend/components/commun" />
      <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\pages\shipment" />
      <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\composables" />
      <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\components\shipment" />
    </key>
    <key name="MoveFile.RECENT_KEYS">
      <recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
-      <recent name="C:\Users\m-tristan\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches" />
      <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">
    <attachedChunks>
      <set>
-        <option value="bundled-php-predefined-a98d8de5180a-0e0d91225499-com.jetbrains.php.sharedIndexes-PS-253.32098.40" />
+        <option value="bundled-php-predefined-a98d8de5180a-0e0d91225499-com.jetbrains.php.sharedIndexes-PS-253.30387.85" />
      </set>
    </attachedChunks>
  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
      <changelist id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="" />
@@ -311,20 +308,182 @@
      <workItem from="1770879701502" duration="25805000" />
      <workItem from="1770966186589" duration="914000" />
      <workItem from="1770967274060" duration="2388000" />
-      <workItem from="1772466451823" duration="598000" />
-      <workItem from="1772626984813" duration="969000" />
-      <workItem from="1772786360430" duration="21000" />
-      <workItem from="1772786475316" duration="3016000" />
-      <workItem from="1773049125640" duration="406000" />
-      <workItem from="1773049540928" duration="539000" />
-      <workItem from="1773050154207" duration="1879000" />
-      <workItem from="1773212999001" duration="652000" />
-      <workItem from="1773215356754" duration="5754000" />
-      <workItem from="1773756072697" duration="5450000" />
-      <workItem from="1773766075191" duration="6202000" />
-      <workItem from="1773824491213" duration="24805000" />
-      <workItem from="1774275549972" duration="51000" />
-      <workItem from="1774276665015" duration="4910000" />
+    </task>
+    <task id="LOCAL-00007" summary="test : ajout de TU sur les services et providers">
+      <option name="closed" value="true" />
+      <created>1768318921478</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1768318921478</updated>
+    </task>
+    <task id="LOCAL-00008" summary="feat : ajout de la génération du bon de reception, correction de la base du formulaire multi-etape de reception et ajout d'une gestion d'erreur global">
+      <option name="closed" value="true" />
+      <created>1768498751836</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1768498751836</updated>
+    </task>
+    <task id="LOCAL-00009" summary="feat : ajout d'une gestion d'erreur au global côté front avec la lib toaster et I18n pour centraliser les messages d'erreur">
+      <option name="closed" value="true" />
+      <created>1768555180530</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1768555180530</updated>
+    </task>
+    <task id="LOCAL-00010" summary="feat : ajout de l'authentification avec lexik">
+      <option name="closed" value="true" />
+      <created>1768832208350</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1768832208350</updated>
+    </task>
+    <task id="LOCAL-00011" summary="feat : update du CHANGELOG.md">
+      <option name="closed" value="true" />
+      <created>1768832516587</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1768832516587</updated>
+    </task>
+    <task id="LOCAL-00012" summary="fix : correction de l'accès au swagger en mode dev qui n'était plus accessible">
+      <option name="closed" value="true" />
+      <created>1768940104944</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1768940104944</updated>
+    </task>
+    <task id="LOCAL-00013" summary="feat : ajout de la conf pour le déploiement en recette">
+      <option name="closed" value="true" />
+      <created>1769005220331</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1769005220331</updated>
+    </task>
+    <task id="LOCAL-00014" summary="fix : fix de la conf pour le déploiement en recette">
+      <option name="closed" value="true" />
+      <created>1769008700008</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1769008700008</updated>
+    </task>
+    <task id="LOCAL-00015" summary="fix : fix de la conf pour le déploiement en recette">
+      <option name="closed" value="true" />
+      <created>1769014602062</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1769014602062</updated>
+    </task>
+    <task id="LOCAL-00016" summary="fix : migration apache vers nginx pour un déploiement plus simple">
+      <option name="closed" value="true" />
+      <created>1769019284586</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1769019284586</updated>
+    </task>
+    <task id="LOCAL-00017" summary="fix : dernière modification pour le déploiement en recette et le changement de conf vers nginx">
+      <option name="closed" value="true" />
+      <created>1769021756823</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1769021756823</updated>
+    </task>
+    <task id="LOCAL-00018" summary="ci : auto tag + release artefact">
+      <option name="closed" value="true" />
+      <created>1769021818384</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1769021818384</updated>
+    </task>
+    <task id="LOCAL-00019" summary="ci : fix release artefact">
+      <option name="closed" value="true" />
+      <created>1769022071620</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1769022071620</updated>
+    </task>
+    <task id="LOCAL-00020" summary="ci : fix release artefact">
+      <option name="closed" value="true" />
+      <created>1769024603812</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1769024603812</updated>
+    </task>
+    <task id="LOCAL-00021" summary="ci : ajout du script et de la doc déploiement">
+      <option name="closed" value="true" />
+      <created>1769026716634</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1769026716634</updated>
+    </task>
+    <task id="LOCAL-00022" summary="fix : correction du path URI pour la création d'un poids dans une réception">
+      <option name="closed" value="true" />
+      <created>1769073690382</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1769073690382</updated>
+    </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>
+    </task>
+    <task id="LOCAL-00024" summary="fix : affiche plus détail dans les logs en recette/prod">
+      <option name="closed" value="true" />
+      <created>1769077633390</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1769077633390</updated>
+    </task>
+    <task id="LOCAL-00025" summary="fix : modification du script de déploiement pour corriger le problème d'écriture des logs de prod">
+      <option name="closed" value="true" />
+      <created>1769079030808</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1769079030808</updated>
+    </task>
+    <task id="LOCAL-00026" summary="fix : doc de déploiement">
+      <option name="closed" value="true" />
+      <created>1769094376813</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1769094376813</updated>
+    </task>
+    <task id="LOCAL-00027" summary="fix : doc et script de déploiement">
+      <option name="closed" value="true" />
+      <created>1769096187792</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1769096187792</updated>
+    </task>
+    <task id="LOCAL-00028" summary="fix : doc et script de déploiement">
+      <option name="closed" value="true" />
+      <created>1769097091268</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1769097091268</updated>
    </task>
    <task id="LOCAL-00029" summary="fix : gitea workflow">
      <option name="closed" value="true" />
@@ -542,183 +701,7 @@
      <option name="project" value="LOCAL" />
      <updated>1770969471135</updated>
    </task>
-    <task id="LOCAL-00056" summary="fix : corrections frontend">
-      <option name="closed" value="true" />
-      <created>1772094268366</created>
-      <option name="number" value="00056" />
-      <option name="presentableId" value="LOCAL-00056" />
-      <option name="project" value="LOCAL" />
-      <updated>1772094268366</updated>
-    </task>
-    <task id="LOCAL-00057" summary="feat : affichage et modification expédition et modification bouton valider">
-      <option name="closed" value="true" />
-      <created>1772111964268</created>
-      <option name="number" value="00057" />
-      <option name="presentableId" value="LOCAL-00057" />
-      <option name="project" value="LOCAL" />
-      <updated>1772111964268</updated>
-    </task>
-    <task id="LOCAL-00058" summary="fix : erreur customer adress et bouton valider oublie">
-      <option name="closed" value="true" />
-      <created>1772112729501</created>
-      <option name="number" value="00058" />
-      <option name="presentableId" value="LOCAL-00058" />
-      <option name="project" value="LOCAL" />
-      <updated>1772112729502</updated>
-    </task>
-    <task id="LOCAL-00059" summary="feat : changelog update">
-      <option name="closed" value="true" />
-      <created>1772112812677</created>
-      <option name="number" value="00059" />
-      <option name="presentableId" value="LOCAL-00059" />
-      <option name="project" value="LOCAL" />
-      <updated>1772112812677</updated>
-    </task>
-    <task id="LOCAL-00060" summary="feat : changelog update">
-      <option name="closed" value="true" />
-      <created>1772177400063</created>
-      <option name="number" value="00060" />
-      <option name="presentableId" value="LOCAL-00060" />
-      <option name="project" value="LOCAL" />
-      <updated>1772177400063</updated>
-    </task>
-    <task id="LOCAL-00061" summary="feat : changelog update">
-      <option name="closed" value="true" />
-      <created>1772177614438</created>
-      <option name="number" value="00061" />
-      <option name="presentableId" value="LOCAL-00061" />
-      <option name="project" value="LOCAL" />
-      <updated>1772177614438</updated>
-    </task>
-    <task id="LOCAL-00062" summary="fix : color tab">
-      <option name="closed" value="true" />
-      <created>1772178540489</created>
-      <option name="number" value="00062" />
-      <option name="presentableId" value="LOCAL-00062" />
-      <option name="project" value="LOCAL" />
-      <updated>1772178540489</updated>
-    </task>
-    <task id="LOCAL-00063" summary="feat : modification front de la page admin transporteur">
-      <option name="closed" value="true" />
-      <created>1772180053740</created>
-      <option name="number" value="00063" />
-      <option name="presentableId" value="LOCAL-00063" />
-      <option name="project" value="LOCAL" />
-      <updated>1772180053740</updated>
-    </task>
-    <task id="LOCAL-00064" summary="fix : espacement et changelog">
-      <option name="closed" value="true" />
-      <created>1772180581178</created>
-      <option name="number" value="00064" />
-      <option name="presentableId" value="LOCAL-00064" />
-      <option name="project" value="LOCAL" />
-      <updated>1772180581178</updated>
-    </task>
-    <task id="LOCAL-00065" summary="fix : espacement">
-      <option name="closed" value="true" />
-      <created>1772180684250</created>
-      <option name="number" value="00065" />
-      <option name="presentableId" value="LOCAL-00065" />
-      <option name="project" value="LOCAL" />
-      <updated>1772180684250</updated>
-    </task>
-    <task id="LOCAL-00066" summary="fix : espacement">
-      <option name="closed" value="true" />
-      <created>1772180972984</created>
-      <option name="number" value="00066" />
-      <option name="presentableId" value="LOCAL-00066" />
-      <option name="project" value="LOCAL" />
-      <updated>1772180972984</updated>
-    </task>
-    <task id="LOCAL-00067" summary="fix : text">
-      <option name="closed" value="true" />
-      <created>1772182545592</created>
-      <option name="number" value="00067" />
-      <option name="presentableId" value="LOCAL-00067" />
-      <option name="project" value="LOCAL" />
-      <updated>1772182545592</updated>
-    </task>
-    <task id="LOCAL-00068" summary="feat : front page admin bovin et changelog">
-      <option name="closed" value="true" />
-      <created>1772182707441</created>
-      <option name="number" value="00068" />
-      <option name="presentableId" value="LOCAL-00068" />
-      <option name="project" value="LOCAL" />
-      <updated>1772182707441</updated>
-    </task>
-    <task id="LOCAL-00069" summary="fix : on ne bloque plus le poids max d'une pesée">
-      <option name="closed" value="true" />
-      <created>1772447581744</created>
-      <option name="number" value="00069" />
-      <option name="presentableId" value="LOCAL-00069" />
-      <option name="project" value="LOCAL" />
-      <updated>1772447581744</updated>
-    </task>
-    <task id="LOCAL-00070" summary="feat : ajout de supplier dans la feed et fixtures">
-      <option name="closed" value="true" />
-      <created>1773761787472</created>
-      <option name="number" value="00070" />
-      <option name="presentableId" value="LOCAL-00070" />
-      <option name="project" value="LOCAL" />
-      <updated>1773761787472</updated>
-    </task>
-    <task id="LOCAL-00071" summary="feat : ajout de bâtiment dans les fixtures et seed + organisation du menu">
-      <option name="closed" value="true" />
-      <created>1773766207721</created>
-      <option name="number" value="00071" />
-      <option name="presentableId" value="LOCAL-00071" />
-      <option name="project" value="LOCAL" />
-      <updated>1773766207721</updated>
-    </task>
-    <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>
-    <task id="LOCAL-00073" summary="fix : correction des retours de la V0">
-      <option name="closed" value="true" />
-      <created>1773841634554</created>
-      <option name="number" value="00073" />
-      <option name="presentableId" value="LOCAL-00073" />
-      <option name="project" value="LOCAL" />
-      <updated>1773841634554</updated>
-    </task>
-    <task id="LOCAL-00074" summary="feat : ajout de l'api de l'état pour chercher les villes via le CP">
-      <option name="closed" value="true" />
-      <created>1773842791819</created>
-      <option name="number" value="00074" />
-      <option name="presentableId" value="LOCAL-00074" />
-      <option name="project" value="LOCAL" />
-      <updated>1773842791819</updated>
-    </task>
-    <task id="LOCAL-00075" summary="fix : script de déploiement + CI/CD build de l'app">
-      <option name="closed" value="true" />
-      <created>1773843922376</created>
-      <option name="number" value="00075" />
-      <option name="presentableId" value="LOCAL-00075" />
-      <option name="project" value="LOCAL" />
-      <updated>1773843922377</updated>
-    </task>
-    <task id="LOCAL-00076" summary="fix : order navbar + modification création fournisseur et client">
-      <option name="closed" value="true" />
-      <created>1773852806120</created>
-      <option name="number" value="00076" />
-      <option name="presentableId" value="LOCAL-00076" />
-      <option name="project" value="LOCAL" />
-      <updated>1773852806121</updated>
-    </task>
-    <task id="LOCAL-00077" summary="fix : order récéption/expédition + correction style bouton récéption">
-      <option name="closed" value="true" />
-      <created>1774283204849</created>
-      <option name="number" value="00077" />
-      <option name="presentableId" value="LOCAL-00077" />
-      <option name="project" value="LOCAL" />
-      <updated>1774283204849</updated>
-    </task>
-    <option name="localTasksCounter" value="78" />
+    <option name="localTasksCounter" value="56" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -768,32 +751,32 @@
    </option>
  </component>
  <component name="VcsManagerConfiguration">
+    <MESSAGE value="fix : gitea workflow" />
+    <MESSAGE value="fix : script de déploiement" />
+    <MESSAGE value="feat : ajout plus d'information sur la liste des réceptions côté front sur la page d'accueil" />
+    <MESSAGE value="fix : redirige sur le login sur une 401 et reset du auth state + doc + timeout du toaster" />
+    <MESSAGE value="feat : ajout de la debug bar en mod dev" />
+    <MESSAGE value="feat : ajout du bundle Malio ednotif pour l'utilisation des WS" />
+    <MESSAGE value="fix : modification de la conf du bundle ednotif" />
+    <MESSAGE value="feat : update du CHANGELOG.md" />
+    <MESSAGE value="feat : finalisation de l'étape 1 &quot;Réception&quot; (formulaire)" />
+    <MESSAGE value="feat : ajout du numéro identification des receptions et ajustement du bon de reception" />
+    <MESSAGE value="feat : ajout de la partie reception des marchandises (étape 3) et modification du bon de réception" />
+    <MESSAGE value="feat : mise en place de composant UI pour les select, checkbox, date, text" />
+    <MESSAGE value="feat : update CHANGELOG.md" />
+    <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" />
+    <MESSAGE value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
    <MESSAGE value="feat : creer une nouvelle expedtion (WIP)" />
    <MESSAGE value="feat : ajout d'une page de creation d'une expedition" />
    <MESSAGE value="feat : changelog" />
    <MESSAGE value="feat : lister les expeditions terminees" />
    <MESSAGE value="fix: corrections diverses" />
    <MESSAGE value="fix : corrections diverses" />
-    <MESSAGE value="fix : corrections frontend" />
-    <MESSAGE value="feat : affichage et modification expédition et modification bouton valider" />
-    <MESSAGE value="fix : erreur customer adress et bouton valider oublie" />
-    <MESSAGE value="feat : changelog update" />
-    <MESSAGE value="fix : color tab" />
-    <MESSAGE value="feat : modification front de la page admin transporteur" />
-    <MESSAGE value="fix : espacement et changelog" />
-    <MESSAGE value="fix : espacement" />
-    <MESSAGE value="fix : text" />
-    <MESSAGE value="feat : front page admin bovin et changelog" />
-    <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" />
-    <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" />
-    <MESSAGE value="feat : ajout de l'api de l'état pour chercher les villes via le CP" />
-    <MESSAGE value="fix : script de déploiement + CI/CD build de l'app" />
-    <MESSAGE value="fix : order navbar + modification création fournisseur et client" />
-    <MESSAGE value="fix : order récéption/expédition + correction style bouton récéption" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix : order récéption/expédition + correction style bouton récéption" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix : corrections diverses" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
@@ -812,6 +795,11 @@
          <url>file://$PROJECT_DIR$/frontend/services/dto/shipment-data.ts</url>
          <option name="timeStamp" value="43" />
        </line-breakpoint>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/frontend/layouts/default.vue</url>
+          <line>72</line>
+          <option name="timeStamp" value="48" />
+        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
  </component>
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -0,0 +1,59 @@
+# AGENTS.md
+
+Project overview
+- Symfony 8 + API Platform 4 backend, Nuxt 3 frontend in `frontend/`.
+- Apache vhost serves API under `/api` and frontend from `frontend/dist`.
+- API base URL on frontend uses `NUXT_PUBLIC_API_BASE` (see `frontend/.env`).
+
+Backend conventions
+- Use English for code identifiers/messages; keep “pont-bascule” as domain term.
+- API Platform operations are defined on Doctrine entities.
+- Reception entity is in `src/Entity/Reception.php`, with custom weigh endpoint `/receptions/weigh`.
+- Reception fields: `date_reception`, `license_plate`, `current_step` (default 0), `is_valid` (default false).
+- Reception also has `identification_number` (auto `N-BR-####`), `merchandise_type`, `merchandise_detail`, `buildings` (M2M), and `pellet_buildings` (via `reception_pellet_building`).
+- `date_reception` is set by the UI, stored as `DateTimeImmutable`, serialized as `Y-m-d`.
+- Weight entity (`src/Entity/Weight.php`) is 1–N with Reception, each row stores `type` (`gross` or `tare`), `dsd`, `weight`, `weighed_at` (all nullable except `type`).
+- Weigh endpoint `/receptions/weigh` returns `PontBasculeReading` with `dsd`, `weight`, `weighedAt` (formatted `Y-m-d`).
+- Custom exception: `App\Exception\PontBasculeException` with French messages, mapped to 500 in provider.
+- Parsing of pont-bascule payload is in `src/Service/PontBasculePayloadDecoder.php`.
+- `config/reference.php` is auto-generated; keep it.
+
+Frontend conventions
+- Nuxt SSR disabled; Tailwind used.
+- Layout in `frontend/layouts/default.vue`: max width `1050px`, header full width.
+- Tailwind custom color palette is `primary` (e.g. `bg-primary-500`).
+- Global font stack uses Helvetica via Tailwind (`font-sans`) and `frontend/assets/css/main.css`.
+- API composable in `frontend/composables/useApi.ts` with `get/post/put/patch/delete` and default JSON/PATCH content types.
+- API errors/success toasts can be customized via `toastErrorMessage`/`toastSuccessMessage` or i18n keys `toastErrorKey`/`toastSuccessKey`. Global method fallbacks use `errors.http.*` keys.
+- `useApi` uses `useNuxtApp().$i18n` (not `useI18n`) to avoid setup-only constraint in service calls.
+- Pinia store: `frontend/stores/reception.ts` is the source of truth for the current reception.
+- Zod is used for form validation (e.g. `frontend/components/reception/reception-form.vue`); shared helpers live in `frontend/utils/zod-errors.ts`.
+- Weighing logic is shared via `frontend/composables/useWeighing.ts`.
+- Reception step UI uses store state (`currentStep`) in `frontend/pages/reception/[[id]].vue`.
+- Step 2 uses `frontend/components/reception/reception-product-received.vue` for merchandise selection; type codes in `frontend/utils/constants.ts`.
+- Active nav styles in header use `NuxtLink` with `custom` slot.
+- Reusable UI components live under `frontend/components/ui/` and are auto-imported with `Ui` prefix (e.g. `UiLoadingDots`).
+- Service layer lives in `frontend/services/` with typed DTOs in `frontend/services/dto/`.
+- Reception service uses `receptions`, `receptions/{id}`, `receptions/weigh` and supports success/error toast keys.
+- Reception receipt endpoint is `receptions/{id}/receipt` (PDF) via `frontend/composables/usePdfPrinter.ts`.
+
+Environment & routing
+- Frontend dev server: `npm run dev` in `frontend/`.
+- API base for local dev: `http://localhost:8080/api` (set in `frontend/.env` via `NUXT_PUBLIC_API_BASE`).
+- CORS handled by Nelmio; `.env` includes `CORS_ALLOW_ORIGIN` regex for localhost.
+- Nuxt i18n locales live in `frontend/i18n/locales` (configured via `langDir: 'locales'`).
+- Default locale is `fr`; translations in `frontend/i18n/locales/fr.json`.
+
+Notes
+- Do not add a GET that creates resources; use POST + PATCH.
+- Keep endpoints in plural (API Platform convention).
+- New reference data added:
+  - Reception types (`reception_type`, fields: `label`, `code`), selectable on reception form.
+  - Merchandise types (`merchandise_type`, fields: `label`, `code`) and pellet types (`pellet_type`, fields: `label`, `code`).
+  - Buildings (`building`, fields: `label`, `code`) and reception allocations (`reception_building` M2M, `reception_pellet_building` unique on reception/pellet/building).
+  - Suppliers (`supplier`) with addresses (`address`, fields: `label`, `street`, `postal_code`, `city`, `country_code` ISO2), via `supplier_address` join table.
+  - Trucks (`truck`, field: `name`), linked to receptions.
+  - Carriers (`carrier`, fields: `name`, nullable `code`), Drivers (`driver`, fields: `name`, `carrier_id`), Vehicles (`vehicle`, fields: `plate`, `carrier_id`, `truck_id`) used for LIOT logic.
+  - Reception links: `reception_type_id`, `supplier_id`, `address_id`, `truck_id`, `carrier_id`, `driver_id`, `user_id`.
+  - Address exposes `fullAddress` via getter for display.
+  - LIOT behavior in reception form: if carrier code = `LIOT`, show driver + vehicle selects and hide manual license plate input; vehicle list filters by truck type and carrier; selected vehicle sets `license_plate`.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,17 +49,6 @@ Ajouter dans le fichier .env du frontend
 * fix layout admin
 * Creation page admin listing bovins
 * Creation page admin ajout/modification bovins
-* [#331] Mettre à jour l'entité Shipment et bovin_shipment
-* [#278] Plan du site
-* [#334] Correctifs
-* [#332] Refonte écran réception terminée
-* [#327] afficher/modifier écran expédition terminée
-* [#352] modification front admin fournisseur
-* [#355] modification front admin transporteur
-* [#356] front page admin bovin
-* [#353] modification front admin client
-* [#353] modification front admin utilisateur
 ### Changed

 ### Fixed
-
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,160 +0,0 @@
-# CLAUDE.md
-
-## Stack
-
- **Backend:** Symfony 8 + API Platform 4 (PHP 8.4)
- **Frontend:** Nuxt 4 (Vue 3, Pinia, Tailwind, Zod) in `frontend/`
- **Infra:** Docker (PHP-FPM + Nginx), Apache vhost serves API sous `/api` et frontend depuis `frontend/dist`
-
-## Commands
-
-```bash
-# Docker
-make start              # Démarrer les containers
-make stop               # Arrêter les containers
-make restart            # Redémarrer les containers
-make shell              # Shell dans le container PHP
-
-# Install complet
-make install            # composer install + migrations + build frontend
-
-# Backend
-make composer-install   # Installer dépendances PHP
-make migration-migrate  # Lancer les migrations
-make fixtures           # Charger les fixtures
-make cache-clear        # Vider le cache Symfony
-make test               # Lancer les tests PHPUnit
-make test FILES=tests/path/to/TestFile.php  # Test spécifique
-make php-cs-fixer-allow-risky FILES=src/... # Fixer le style
-
-# Frontend
-make build-nuxtJS       # npm install + build:dist (dans le container)
-make dev-nuxt           # Serveur dev Nuxt (dans le container)
-# Ou directement dans frontend/ :
-cd frontend && npm run dev     # Dev server (port 3000)
-cd frontend && npm run build:dist  # Build production
-
-# Base de données
-make db-reset           # ⚠️ Supprime et recrée la BDD + migrations + fixtures
-```
-
-## Architecture backend
-
-```
-src/
-├── ApiResource/        # Ressources API Platform custom
-├── Command/            # Commandes Symfony (dont app:seed)
-├── DataFixtures/       # Fixtures Doctrine
-├── Dto/                # DTOs (ex: PontBasculeReading)
-├── Entity/             # Entités Doctrine (= ressources API Platform)
-├── Exception/          # Exceptions custom (PontBasculeException)
-├── Kernel.php
-├── Service/            # Services métier (PontBasculePayloadDecoder…)
-└── State/              # State providers/processors API Platform
-```
-
-## Architecture frontend
-
-```
-frontend/
-├── components/
-│   ├── ui/             # Composants réutilisables, auto-importés avec préfixe Ui (ex: UiLoadingDots)
-│   ├── 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)
-├── utils/              # Constants, zod-errors helpers
-└── assets/css/         # Tailwind config, main.css (font Helvetica)
-```
-
-## Conventions backend
-
- Code en anglais ; "pont-bascule" est un terme métier conservé tel quel.
- Les opérations API Platform sont définies directement sur les entités Doctrine.
- Pas de classes Repository custom : utiliser `EntityManagerInterface` avec les repos par défaut.
- `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
-
- SSR désactivé. Tailwind avec palette custom `primary` (ex: `bg-primary-500`).
- `useApi` (`composables/useApi.ts`) : méthodes `get/post/put/patch/delete` avec content-types par défaut.
-  - Toasts personnalisables via `toastErrorMessage`/`toastSuccessMessage` ou clés i18n `toastErrorKey`/`toastSuccessKey`.
-  - Utilise `useNuxtApp().$i18n` (pas `useI18n`) pour fonctionner hors setup.
- Validation formulaires avec Zod ; helpers dans `utils/zod-errors.ts`.
- 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 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).
- `BuildingCase` a `bovines` (OneToMany).
- 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, `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
-
- API base dev : `http://localhost:8080/api` (via `NUXT_PUBLIC_API_BASE` dans `frontend/.env`)
- CORS : Nelmio, configurable via `CORS_ALLOW_ORIGIN` dans `.env`
- Locale par défaut : `fr` — traductions dans `frontend/i18n/locales/fr.json`
- Docker env : `docker/.env.docker` (défaut) avec override possible via `docker/.env.docker.local`
--- a/config/packages/api_platform.yaml
+++ b/config/packages/api_platform.yaml
@@ -3,6 +3,8 @@ api_platform:
    version: 1.0.0
    defaults:
        stateless: true
+        pagination_client_items_per_page: true
+        pagination_maximum_items_per_page: 100
        cache_headers:
            vary: ['Content-Type', 'Authorization', 'Origin']
    formats:
--- a/config/reference.php
+++ b/config/reference.php
@@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 // This file is auto-generated and is for apps only. Bundles SHOULD NOT rely on its content.

 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
@@ -1472,7 +1470,7 @@ use Symfony\Component\Config\Loader\ParamConfigurator as Param;
 *     mercure?: bool|array{
 *         enabled?: bool|Param, // Default: false
 *         hub_url?: scalar|Param|null, // The URL sent in the Link HTTP header. If not set, will default to the URL for MercureBundle's default hub. // Default: null
- *         include_type?: bool|Param, // Always include @var in updates (including delete ones). // Default: false
+ *         include_type?: bool|Param, // Always include @type in updates (including delete ones). // Default: false
 *     },
 *     messenger?: bool|array{
 *         enabled?: bool|Param, // Default: false
--- a/config/version.yaml
+++ b/config/version.yaml
@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.76'
+    app.version: '0.0.51'
--- a/frontend/assets/css/main.css
+++ b/frontend/assets/css/main.css
@@ -7,17 +7,3 @@
    @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;
-  }
-}
--- a/frontend/components/address.vue
+++ b/frontend/components/address.vue
@@ -1,45 +1,35 @@
 <template>
-    <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"/>
+    <form @submit.prevent="validateForm">
+        <div class="flex items-center justify-between gap-10">
+            <div>
+                <h1 class="text-3xl font-bold uppercase">
+                    {{ props.address ? "Modification d'une adresse" : "Ajout d'une adresse" }}
+                </h1>
            </div>
-            <h1 class="text-3xl text-primary-500 font-bold uppercase">
-                {{ props.address ? "Modification d'une adresse" : "Ajout d'une adresse" }}
-            </h1>
+
+            <button
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                type="submit"
+                :disabled="isLoading"
+            >
+                {{ props.address? "Sauvegarder" : "Ajouter" }}
+            </button>
        </div>

-        <div class="grid grid-cols-2 gap-y-16 gap-x-[200px] mb-16">
-            <UiTextInput id="address-street" v-model="form.street" label="Rue" required />
+        <div class="grid grid-cols-2 gap-y-16 gap-x-12 mb-16 mt-10">
+            <UiTextInput id="address-label" v-model="form.label" label="Libellé" />
+            <UiTextInput id="address-street" v-model="form.street" label="Rue" />
            <UiTextInput id="address-street2" v-model="form.street2" label="Complément" />
-            <UiTextInput id="address-postalCode" v-model="form.postalCode" label="Code postal" required />
-            <UiSelect
-                id="address-city"
-                v-model="form.city"
-                label="Ville"
-                :options="communeOptions"
-                :loading="isLoadingCities"
-                :disabled="communes.length === 0"
-                required
-            />
-            <UiTextInput id="address-country" v-model="form.countryCode" label="Pays (code)" />
-        </div>
-        <div class="flex justify-center items-center">
-        <UiButton
-            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>
+            <UiTextInput id="address-postalCode" v-model="form.postalCode" label="Code postal" />
+            <UiTextInput id="address-city" v-model="form.city" label="Ville" />
+            <UiTextInput id="address-country" v-model="form.countryCode" label="Pays" />
        </div>
    </form>
 </template>

 <script setup lang="ts">
-import type { AddressPayload } from "~/services/address"
-import { getCommunesByPostalCode, type CommuneData } from "~/services/geo"
+import { AddressPayload } from "~/services/address"
+

 const route = useRoute()
 const router = useRouter()
@@ -50,45 +40,26 @@ const props = defineProps<{
 }>()

 const isLoading = ref(false)
-const submitted = ref(false)
-const communes = ref<CommuneData[]>([])
-const isLoadingCities = ref(false)
-
-const communeOptions = computed(() =>
-    communes.value.map(c => ({ value: c.nom, label: c.nom }))
-)

 const emptyForm = (): AddressPayload => ({
+    label: "",
    street: "",
    street2: null,
    postalCode: "",
    city: "",
-    countryCode: "FR",
+    countryCode: "",
 })

 const form = reactive<AddressPayload>(emptyForm())

-const backPath = computed(() => {
-    if (props.type === "customer") {
-        const customerId = Number(route.query.customerId)
-        return Number.isFinite(customerId) && customerId > 0
-            ? `/admin/customer/${customerId}`
-            : "/admin/customer/customer-list"
-    }
-
-    const supplierId = Number(route.query.supplierId)
-    return Number.isFinite(supplierId) && supplierId > 0
-        ? `/admin/supplier/${supplierId}`
-        : "/admin/supplier/supplier-list"
-})
-
 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 || "FR"
+    form.countryCode = data.countryCode ?? ""
 }

 watch(
@@ -99,50 +70,11 @@ watch(
    { immediate: true }
 )

-let debounceTimer: ReturnType<typeof setTimeout> | null = null
-
-watch(
-    () => form.postalCode,
-    (cp) => {
-        if (debounceTimer) clearTimeout(debounceTimer)
-
-        if (!cp || cp.length < 5) {
-            communes.value = []
-            form.city = ''
-            return
-        }
-
-        if (cp.length === 5) {
-            debounceTimer = setTimeout(async () => {
-                isLoadingCities.value = true
-                const previousCity = form.city
-                try {
-                    communes.value = await getCommunesByPostalCode(cp)
-
-                    if (communes.value.length === 1) {
-                        form.city = communes.value[0].nom
-                    } else if (communes.value.some(c => c.nom === previousCity)) {
-                        form.city = previousCity
-                    } else {
-                        form.city = ''
-                    }
-                } finally {
-                    isLoadingCities.value = false
-                }
-            }, 300)
-        }
-    }
-)
-
 const validateForm = () => {
    if (isLoading.value) return
    emit("validate", {...form})
 }

-const goBack = () => {
-    router.push(backPath.value)
-}
-
 const emit = defineEmits<{
    (event: 'validate', form: AddressPayload): void
 }>()
--- a/frontend/components/card-link.vue
+++ b/frontend/components/card-link.vue
@@ -2,17 +2,17 @@

 <template>
    <NuxtLink :to="link">
-        <div class="w-[300px] h-[216px] border border-primary-700 rounded-lg p-6 flex flex-col justify-between gap-4">
+        <div class="w-[300px] h-[216px] border border-black rounded-lg p-6 flex flex-col justify-between gap-4">
            <div class="flex justify-between">
                <div class="rounded-full w-[80px] h-[80px] bg-[#D9D9D9] flex justify-center items-center">
-                    <Icon :name="iconName" class="!text-primary-700" size="44" />
+                    <Icon :name="iconName" style="color: black" size="44" />
                </div>
                <div>
                    <Icon name="mdi:plus" style="color: black" size="44"  />
                </div>
            </div>
            <div class="uppercase font-bold">
-                <p class="text-3xl text-primary-700">
+                <p class="text-3xl text-primary-500">
                    <slot name="label">{{ label }}</slot>
                </p>
            </div>
--- a/frontend/components/commun/update-weight.vue
+++ b/frontend/components/commun/update-weight.vue
@@ -1,65 +0,0 @@
-<template>
-    <form>
-        <div class="grid grid-cols-3 gap-x-40 gap-y-8 mb-8">
-            <UiNumberInput
-                :key="localWeight.type"
-                :label="'POIDS'"
-                labelClass="font-bold uppercase text-xl "
-                v-model="localWeight.weight"
-                :disabled="!isAdmin"
-                :min="0"
-                wrapper-class="flex-col"
-                required
-            />
-
-            <UiDateInput
-                label="Date de pesée"
-                v-model="localWeight.weighedAt"
-                :disabled="!isAdmin"
-                required
-            />
-
-            <UiNumberInput
-                label="Dsd"
-                class="col-start-2"
-                labelClass="font-bold uppercase"
-                v-model="localWeight.dsd"
-                :disabled="!isAdmin"
-                wrapper-class="flex-col"
-                required
-            />
-        </div>
-    </form>
-</template>
-
-<script setup lang="ts">
-import type {WeightEntryData} from '~/services/dto/weight-data'
-import {reactive, watch} from "vue";
-
-const props = defineProps<{
-    modelValue: WeightEntryData
-    isAdmin: boolean
-}>()
-
-const emit = defineEmits<{
-    (event: 'update:modelValue', value: WeightEntryData): void
-}>()
-
-const localWeight = reactive<WeightEntryData>({...props.modelValue})
-
-watch(
-    () => props.modelValue,
-    (value) => {
-        Object.assign(localWeight, value)
-    },
-    {deep: true}
-)
-
-watch(
-    localWeight,
-    (value) => {
-        emit('update:modelValue', {...value})
-    },
-    {deep: true}
-)
-</script>
--- a/frontend/components/reception/reception-bovine-received.vue
+++ b/frontend/components/reception/reception-bovine-received.vue
@@ -1,16 +1,14 @@
 <template>
-    <form
+    <div
        v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"
-        class="flex flex-col gap-16"
-        @submit.prevent="goNext"
-    >
+        class="flex flex-col items-center gap-16">
        <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">
+            class="flex flex-row gap-8 items-center">
            <div
                v-for="type in bovineType"
                :key="type.id"
-                class="mt-8 flex flex-row mb-2 w-full">
+                class="mt-8 flex flex-row mb-2 gap-6">
                <UiNumberInput
                    :id="type.id"
                    :label="type.label"
@@ -19,8 +17,6 @@
                    :placeholder="0"
                    :min="0"
                    :max="10"
-                    class="max-w-[150px]"
-                    wrapper-class="gap-3"
                />
            </div>
            <div
@@ -28,22 +24,15 @@
                <UiNumberInput
                    label="Autres"
                    v-model="otherQuantity"
-                    class="max-w-[80px]"
-                    wrapper-class="gap-3"
                />
            </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"
-            >Valider
-            </UiButton>
-        </div>
-    </form>
+        <button
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            @click="goNext"
+        >Valider
+        </button>
+    </div>
 </template>
 <script setup lang="ts">
 import type {BovineTypeData} from "~/services/dto/bovine-type-data";
@@ -62,7 +51,6 @@ 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)
@@ -174,13 +162,7 @@ async function goNext() {
        return
    }

-    showBovineError.value = false
-
-    if (totalBovines.value === 0) {
-        showBovineError.value = true
-        return
-    }
-
+    // @TODO Ajouter un composable pour le toaster qui gère les key i18n
    if (totalBovines.value > 52) {
        toast.error({
            title: 'Erreur',
--- a/frontend/components/reception/reception-form.vue
+++ b/frontend/components/reception/reception-form.vue
@@ -1,7 +1,8 @@
 <template>
-    <form :class="{ submitted }" @submit.prevent="validate">
+    <form @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"
@@ -12,15 +13,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"
@@ -30,8 +31,8 @@
                    label: type.label
                }))"
                wrapper-class="col-start-1 row-start-4"
-                required
            />
+            <!--    Fournisseur        -->
            <UiSelect
                id="reception-supplier"
                v-model="form.supplierId"
@@ -42,17 +43,20 @@
                }))"
                :loading="isLoadingSuppliers"
                wrapper-class="col-start-1 row-start-5"
-                required
            />
+            <!--    Adresse fournisseur        -->
            <UiSelect
                id="reception-address"
                v-model="form.addressId"
                label="Adresse"
-                :options="addressOptions"
-                :disabled="isLoadingSuppliers || ownerAddresses.length === 0"
+                :options="supplierAddresses.map((address) => ({
+                    value: String(address.id),
+                    label: address.fullAddress
+                }))"
+                :disabled="isLoadingSuppliers || supplierAddresses.length === 0"
                wrapper-class="col-start-2 row-start-1"
-                required
            />
+            <!--    Camion        -->
            <UiSelect
                id="reception-truck"
                v-model="form.truckId"
@@ -63,8 +67,8 @@
                }))"
                :loading="isLoadingTrucks"
                wrapper-class="col-start-2 row-start-2"
-                required
            />
+            <!--    Transporteur        -->
            <UiSelect
                id="reception-carrier"
                v-model="form.carrierId"
@@ -76,15 +80,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"
@@ -97,8 +101,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"
@@ -110,38 +114,42 @@
                :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 mb-16 uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
-                @click="submitted = true"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
            >Valider
            </UiButton>
        </div>
    </form>
+
 </template>

 <script setup lang="ts">
-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'
+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";

 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),
@@ -154,27 +162,62 @@ 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)

-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)
+// 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 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) {
@@ -182,6 +225,50 @@ 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 {
@@ -191,32 +278,185 @@ const loadSuppliers = async () => {
    }
 }

-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 camions pour le select
+const loadTrucks = async () => {
+    isLoadingTrucks.value = true
+    try {
+        trucks.value = await getTruckList()
+    } finally {
+        isLoadingTrucks.value = false
+    }
+}

+// 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 loadCommonData()
+    await loadTrucks()
+    await loadCarriers()
    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()
@@ -227,14 +467,27 @@ 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,
@@ -249,7 +502,7 @@ async function validate() {

    const payload = {
        ...basePayload,
-        ...(isLiotCarrier.value && driverIri ? { driver: driverIri } : {})
+        ...(isLiotCarrier.value && driverIri ? {driver: driverIri} : {})
    }

    if (!receptionStore.current) {
@@ -279,4 +532,5 @@ async function validate() {
        ...payload
    })
 }
+
 </script>
--- a/frontend/components/reception/reception-product-received.vue
+++ b/frontend/components/reception/reception-product-received.vue
@@ -1,5 +1,5 @@
 <template>
-    <form :class="['flex flex-col items-center gap-16', { submitted }]" @submit.prevent="goNext">
+    <div class="flex flex-col items-center gap-16">
        <div
            v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
            class="flex flex-col gap-16 items-center w-full">
@@ -10,7 +10,6 @@
                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"
@@ -22,30 +21,24 @@
                    label="Préciser"
                    placeholder="Précisions complémentaires"
                    :maxlength="255"
-                    required
                />
            </div>

            <div
                v-if="selectedMerchandiseTypeId && !isGranule"
-                class="flex flex-col gap-4 w-[550px]"
+                class="flex gap-4 w-[550px] justify-between"
            >
-                <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
+                    v-for="building in buildings"
+                    :key="building.id"
+                >
+                    <UiCheckbox
+                        v-model="selectedBuildingIds"
+                        :value="String(building.id)"
+                        :label="building.label"
+                        label-class="text-xl"
+                    />
                </div>
-                <p class="text-red-500 text-sm" :class="showBuildingError ? '' : 'invisible'">
-                    Veuillez sélectionner au moins un bâtiment.
-                </p>
            </div>

            <div
@@ -69,20 +62,14 @@
                        </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="submitted = true"
-            >Valider
-            </UiButton>
-        </div>
-    </form>
+        <button
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            @click="goNext"
+        >Valider
+        </button>
+    </div>
 </template>

 <script setup lang="ts">
@@ -110,9 +97,6 @@ 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 => {
@@ -195,23 +179,6 @@ 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}`

--- a/frontend/components/reception/reception-weight.vue
+++ b/frontend/components/reception/reception-weight.vue
@@ -0,0 +1,101 @@
+<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="showLoadingBox"
+                class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[86px]">
+                    <UiLoadingDots />
+            </div>
+            <div v-else-if="displayWeight !== null" 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, onMounted} 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('/')
+}
+
+// Récupère le poids dès l'arrivée sur l'écran
+onMounted(() => {
+    if (displayWeight.value === null) {
+        fetchWeight()
+    }
+})
+</script>
--- a/frontend/components/reception/update-bovin.vue
+++ b/frontend/components/reception/update-bovin.vue
@@ -1,161 +1,183 @@
 <template>
-    <form>
-        <div class="flex flex-row justify-between gap-x-12 font-bold uppercase mb-8">
+    <form @submit.prevent="validate">
+    <div
+        class="flex flex-col items-center gap-16">
+        <div
+            class="flex flex-row gap-6 items-center">
            <div
-                v-for="type in bovineTypes"
+                v-for="type in bovineType"
                :key="type.id"
-            >
+                class="flex flex-row mb-2 gap-6 ">
                <UiNumberInput
                    :label="type.label"
                    :code="type.code"
-                    v-model="localQuantities[String(type.id)]"
-                    :disabled="!isAdmin"
+                    v-model="bovineQuantities[String(type.id)]"
+                    :disabled="!auth.isAdmin"
                    :placeholder="0"
                    :min="0"
                    :max="10"
-                    wrapperClass="w-44 flex-col"
-                    inputClass="font-medium"
                />
            </div>
-            <UiNumberInput
-                label="Autres"
-                v-model="localOtherQuantity"
-                :disabled="!isAdmin"
-                wrapperClass="w-44 flex-col"
-                inputClass="font-medium"
-            />
+            <div
+                class=" flex flex-row mb-2 gap-6">
+                <UiNumberInput
+                    label="Autres"
+                    v-model="otherQuantity"
+                    :disabled="!auth.isAdmin"
+                />
+            </div>
        </div>
+        <UiButton
+            type="submit"
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            :disabled="!auth.isAdmin"
+        >Valider
+        </UiButton>
+    </div>
    </form>
 </template>
-
 <script setup lang="ts">
-import { onMounted, reactive, ref, watch } from 'vue'
-import { getBovineTypeList } from '~/services/bovine-type'
-import type { BovineTypeData } from '~/services/dto/bovine-type-data'
-import type { ReceptionBovineTypeData } from '~/services/dto/reception-bovine-data'
-
+import type {BovineTypeData} from "~/services/dto/bovine-type-data";
+import {getBovineTypeList} from "~/services/bovine-type";
+import {
+    createReceptionBovine,
+    deleteReceptionBovine,
+    getReceptionBovineList,
+    updateReceptionBovine
+} from "~/services/reception-bovine";
+import {computed, onMounted, reactive, ref, watch} from "vue";
+import {getReception, updateReception} from "~/services/reception";
+const toast = useToast()
+const isLoadingBovineType = ref(false)
+const bovineType = ref<BovineTypeData[]>([])
+const bovineQuantities = reactive<Record<string, number | null>>({})
+const otherQuantity = ref<number | null>(0)
+const auth = useAuthStore()
 const props = defineProps<{
-    modelValue: ReceptionBovineTypeData[]
-    otherQuantity: number | null
-    isAdmin: boolean
+    idReception: number
 }>()
+const receptionId = props.idReception
+const reception = await getReception(receptionId)

-const emit = defineEmits<{
-    (event: 'update:modelValue', value: ReceptionBovineTypeData[]): void
-    (event: 'update:otherQuantity', value: number | null): void
-}>()
+const receptionIri = computed(() =>
+    receptionId ? `/api/receptions/${receptionId}` : null
+)
+const totalBovines = computed(() => {
+    const base = Object.values(bovineQuantities).reduce((sum, value) => {
+        return sum + (value ?? 0)
+    }, 0)
+    return base + (otherQuantity.value ?? 0)
+})

-const bovineTypes = ref<BovineTypeData[]>([])
-const localQuantities = reactive<Record<string, number | null>>({})
-const localOtherQuantity = ref<number | null>(props.otherQuantity ?? 0)
-// Verrou pour éviter les boucles props -> local -> emit -> props.
-const isSyncing = ref(false)
-
-function entriesEqualByTypeAndQuantity(
-    left: ReceptionBovineTypeData[],
-    right: ReceptionBovineTypeData[]
-): boolean {
-    const toMap = (entries: ReceptionBovineTypeData[]) => {
-        const map = new Map<number, number>()
-        for (const entry of entries) {
-            const typeId = entry.bovineType?.id ?? 0
-            map.set(typeId, entry.quantity ?? 0)
-        }
-
-        return map
-    }
-
-    const a = toMap(left)
-    const b = toMap(right)
-    if (a.size !== b.size) {
-        return false
-    }
-
-    for (const [typeId, quantity] of a.entries()) {
-        if ((b.get(typeId) ?? 0) !== quantity) {
-            return false
-        }
-    }
-
-    return true
-}
-
-function buildEntriesFromLocal(): ReceptionBovineTypeData[] {
-    return bovineTypes.value.map((type) => {
-        const existing = props.modelValue.find((entry) => entry.bovineType.id === type.id)
-        return {
-            id: existing?.id ?? 0,
-            bovineType: type,
-            quantity: localQuantities[String(type.id)] ?? 0
-        }
-    })
-}
-
-function syncLocalFromProps() {
-    isSyncing.value = true
+const loadBovineType = async () => {
+    isLoadingBovineType.value = true
    try {
-        for (const key of Object.keys(localQuantities)) {
-            delete localQuantities[key]
-        }
-
-        for (const type of bovineTypes.value) {
-            const existing = props.modelValue.find((entry) => entry.bovineType.id === type.id)
-            localQuantities[String(type.id)] = existing?.quantity ?? 0
-        }
+        bovineType.value = await getBovineTypeList()
    } finally {
-        isSyncing.value = false
+        isLoadingBovineType.value = false
    }
 }

+onMounted(async () => {
+    await loadBovineType()
+})
+
 watch(
-    () => props.otherQuantity,
-    (value) => {
-        if (isSyncing.value) {
+    [() => receptionId, () => bovineType.value],
+    async ([id, types]) => {
+        if (!id || !receptionIri.value || types.length === 0) {
            return
        }

-        const next = value ?? 0
-        isSyncing.value = true
-        localOtherQuantity.value = next
-        isSyncing.value = false
-    }
+        const selectionMap: Record<string, number | null> = {}
+        for (const type of types) {
+            selectionMap[String(type.id)] = 0
+        }
+
+        const existing = await getReceptionBovineList(receptionIri.value)
+        for (const selection of existing) {
+            const bovineTypeId = String(selection.bovineType.id)
+            selectionMap[bovineTypeId] = selection.quantity ?? 0
+        }
+
+        for (const key of Object.keys(bovineQuantities)) {
+            delete bovineQuantities[key]
+        }
+        Object.assign(bovineQuantities, selectionMap)
+
+        const existingOther = reception.bovineDetail
+        const parsedOther =
+            typeof existingOther === 'string' && existingOther.trim() !== ''
+                ? Number(existingOther)
+                : 0
+        otherQuantity.value = Number.isFinite(parsedOther) ? parsedOther : 0
+    },
+    {immediate: true}
 )

-watch(localOtherQuantity, (value) => {
-    if (isSyncing.value) {
+async function syncBovineSelections(receptionIri: string) {
+    const existing = await getReceptionBovineList(receptionIri)
+    const existingMap = new Map<string, { id: number; quantity: number | null }>()
+
+    for (const selection of existing) {
+        const bovineTypeId = String(selection.bovineType.id)
+        existingMap.set(bovineTypeId, {
+            id: selection.id,
+            quantity: selection.quantity ?? 0
+        })
+    }
+
+    // Supprime les entrées supprimées ou modifiées
+    for (const [bovineTypeId, entry] of existingMap.entries()) {
+        const selectedQuantity = bovineQuantities[bovineTypeId] ?? 0
+        if (!selectedQuantity) {
+            await deleteReceptionBovine(entry.id)
+            existingMap.delete(bovineTypeId)
+            continue
+        }
+
+        if (selectedQuantity !== entry.quantity) {
+            await updateReceptionBovine(entry.id, {quantity: selectedQuantity})
+            existingMap.set(bovineTypeId, {
+                id: entry.id,
+                quantity: selectedQuantity
+            })
+        }
+    }
+
+    // Crée les entrées manquantes
+    for (const [bovineTypeId, quantity] of Object.entries(bovineQuantities)) {
+        if (!quantity) {
+            continue
+        }
+        if (existingMap.has(bovineTypeId)) {
+            // Déjà à jour
+            continue
+        }
+        await createReceptionBovine({
+            reception: receptionIri,
+            bovineType: `/api/bovine_types/${bovineTypeId}`,
+            quantity
+        })
+    }
+}
+
+async function validate() {
+    // @TODO Ajouter un composable pour le toaster qui gère les key i18n
+    if (totalBovines.value > 52) {
+        toast.error({
+            title: 'Erreur',
+            message: ('Le total des bovins ne peut pas dépasser 52.')
+        })
        return
    }

-    const next = value ?? 0
-    emit('update:otherQuantity', next)
-})
+    await syncBovineSelections(receptionIri.value)

-watch(
-    () => props.modelValue,
-    () => {
-        // Hydratation locale uniquement quand le parent change.
-        syncLocalFromProps()
-    },
-    { immediate: true }
-)
-
-watch(
-    localQuantities,
-    () => {
-        if (isSyncing.value) {
-            return
-        }
-        // N'émet que si les quantités diffèrent réellement du parent.
-        const nextEntries = buildEntriesFromLocal()
-        if (!entriesEqualByTypeAndQuantity(nextEntries, props.modelValue)) {
-            emit('update:modelValue', nextEntries)
-        }
-    },
-    { deep: true }
-)
-
-onMounted(async () => {
-    bovineTypes.value = await getBovineTypeList()
-    syncLocalFromProps()
-})
+    await updateReception(receptionId, {
+        merchandiseType: null,
+        merchandiseDetail: null,
+        bovineDetail: otherQuantity.value ? String(otherQuantity.value) : null,
+    })
+}
 </script>
--- a/frontend/components/reception/update-merchandise.vue
+++ b/frontend/components/reception/update-merchandise.vue
@@ -1,37 +1,33 @@
 <template>
-    <form>
-        <div class="flex flex-col">
-            <div class="w-full relative grid grid-cols-[1fr_200px]">
-                <UiRadioGroup
+    <form @submit.prevent="validate">
+        <div class="flex flex-col items-center gap-16">
+            <div
+                class="flex flex-col gap-16 items-center w-full">
+                <UiTextInput
                    id="merchandise-type"
                    v-model="selectedMerchandiseTypeId"
                    label="Type de marchandises"
-                    :options="merchandiseTypes.map((type) => ({
-                        value: String(type.id),
-                        label: type.label
-                    }))"
-                    input-class="accent-primary-700 focus:ring-primary-700"
-                    option-label-class="uppercase"
-                    wrapper-class="w-full uppercase"
-                    group-class="grid grid-cols-4 mt-9 mb-7"
-                    :disabled="!isAdmin"
+                    :value="reception.merchandiseType?.label"
+                    wrapper-class="w-[550px]"
+                    :disabled="true"
                />
-                <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
+                    v-if="merchandiseTypeId && isAutres"
+                    class="flex flex-col w-full max-w-[550px]"
+                >
+                    <UiTextInput
+                        id="merchandise-detail"
+                        :disabled="!auth.isAdmin"
+                        v-model="merchandiseDetail"
+                        label="Préciser"
+                        placeholder="Précisions complémentaires"
+                        :maxlength="255"
+                    />
+                </div>

-            <div
-                v-if="selectedMerchandiseTypeId && !isGranule"
-                class="w-full grid grid-cols-[1fr_200px]"
-            >
-                <div class="grid grid-cols-4 gap-6"
+                <div
+                    v-if="merchandiseTypeId && !isGranule"
+                    class="flex gap-4 w-[550px] justify-evenly"
                >
                    <div
                        v-for="building in buildings"
@@ -41,214 +37,112 @@
                            v-model="selectedBuildingIds"
                            :value="String(building.id)"
                            :label="building.label"
-                            :disabled="!isAdmin"
-                            input-class="accent-primary-700 focus:ring-primary-700"
-                            label-class="uppercase"
+                            :disabled="!auth.isAdmin"
+                            label-class="text-xl"
                        />
                    </div>
                </div>
-            </div>

-            <div
-                v-if="selectedMerchandiseTypeId && isGranule"
-                class="grid grid-cols-[1fr_200px] w-full col-start-2 row-start-1"
-            >
-                <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
-                            v-for="building in buildings"
-                            :key="building.id"
-                            class="flex text-lg"
-                        >
-                            <UiCheckbox
-                                v-model="selectedPelletBuildingIds[String(type.id)]"
-                                :value="String(building.id)"
-                                :label="building.label"
-                                :disabled="!isAdmin"
-                                input-class="accent-primary-700 focus:ring-primary-700"
-                                label-class="text-lg"
-                            />
+                <div
+                    v-if="merchandiseTypeId && isGranule"
+                    class="flex flex-col gap-10 w-full max-w-[1100px]"
+                >
+                    <div class="grid grid-cols-1 gap-10 md:grid-cols-4">
+                        <div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">
+                            <p class="font-bold uppercase">{{ type.label }}</p>
+                            <div
+                                v-for="building in buildings"
+                                :key="building.id"
+                                class="flex items-center gap-2 text-lg"
+                            >
+                                <UiCheckbox
+                                    v-model="selectedPelletBuildingIds[String(type.id)]"
+                                    :value="String(building.id)"
+                                    :label="building.label"
+                                    :disabled="!auth.isAdmin"
+                                    label-class="text-lg"
+                                />
+                            </div>
                        </div>
                    </div>
                </div>
            </div>
+            <UiButton
+                v-if="auth.isAdmin"
+                type="submit"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                :disabled="!auth.isAdmin"
+            >Valider
+            </UiButton>
        </div>
    </form>
 </template>

 <script setup lang="ts">
-import { computed, onMounted, ref, watch } from 'vue'
-import type { BuildingData } from '~/services/dto/building-data'
-import type { MerchandiseTypeData } from '~/services/dto/merchandise-type-data'
-import type { PelletTypeData } from '~/services/dto/pellet-type-data'
-import type { MerchandiseEntryData } from '~/services/dto/reception-data'
-import { getBuildingList } from '~/services/building'
-import { getMerchandiseTypeList } from '~/services/merchandise-type'
-import { getPelletTypeList } from '~/services/pellet-type'
-import { MERCHANDISE_TYPE_CODES } from '~/utils/constants'
-
-const props = defineProps<{
-    modelValue: MerchandiseEntryData
-    isAdmin: boolean
-}>()
-
-const emit = defineEmits<{
-    (event: 'update:modelValue', value: MerchandiseEntryData): void
-}>()
+import {computed, onMounted, ref} from 'vue'
+import {getBuildingList} from '~/services/building'
+import {getMerchandiseTypeList} from '~/services/merchandise-type'
+import type {MerchandiseTypeData} from '~/services/dto/merchandise-type-data'
+import type {BuildingData} from '~/services/dto/building-data'
+import type {PelletTypeData} from '~/services/dto/pellet-type-data'
+import {getPelletTypeList} from '~/services/pellet-type'
+import {
+    createReceptionPelletBuilding,
+    deleteReceptionPelletBuilding,
+    getReceptionPelletBuildingList
+} from '~/services/reception-pellet-building'
+import {MERCHANDISE_TYPE_CODES} from '~/utils/constants'
+import {getReception, updateReception} from "~/services/reception";

 const merchandiseTypes = ref<MerchandiseTypeData[]>([])
 const buildings = ref<BuildingData[]>([])
 const pelletTypes = ref<PelletTypeData[]>([])
-
 const selectedMerchandiseTypeId = ref('')
 const selectedBuildingIds = ref<string[]>([])
 const selectedPelletBuildingIds = ref<Record<string, string[]>>({})
 const merchandiseDetail = ref('')
-// Verrou de synchro pour empêcher les aller-retours infinis entre parent et composant.
-const isSyncing = ref(false)
-const isReady = ref(false)
+const auth = useAuthStore()
+const props = defineProps<{
+    idReception: number
+}>()
+const receptionId = props.idReception
+const reception = await getReception(receptionId)
+const merchandiseTypeId = await reception.receptionType?.id

+// Extrait l'ID d'une relation depuis un IRI ou un objet complet.
+const getRelationId = (value: unknown): string | null => {
+    if (!value) {
+        return null
+    }
+
+    if (typeof value === 'string') {
+        const match = value.match(/\/(\d+)$/)
+        return match ? match[1] : null
+    }
+
+    if (typeof value === 'object' && 'id' in value) {
+        const record = value as { id?: number | string }
+        if (typeof record.id === 'number') {
+            return String(record.id)
+        }
+        if (typeof record.id === 'string') {
+            return record.id
+        }
+    }
+
+    return null
+}
+
+// Type de marchandise sélectionné dans le select
 const selectedMerchandiseType = computed(() =>
-    merchandiseTypes.value.find((type) => String(type.id) === selectedMerchandiseTypeId.value) ?? null
-)
-const isGranule = computed(
-    () => selectedMerchandiseType.value?.code === MERCHANDISE_TYPE_CODES.GRANULE
-)
-const isAutres = computed(
-    () => selectedMerchandiseType.value?.code === MERCHANDISE_TYPE_CODES.AUTRES
-)
-
-function clonePelletSelections(value: Record<string, string[]>) {
-    const clone: Record<string, string[]> = {}
-    for (const [key, buildingIds] of Object.entries(value)) {
-        clone[key] = [...buildingIds]
-    }
-    return clone
-}
-
-function sorted(values: string[]): string[] {
-    return [...values].sort()
-}
-
-function normalizeModel(value: MerchandiseEntryData): MerchandiseEntryData {
-    // Normalisation stable pour comparer deux modèles sans faux positifs (ordre des tableaux).
-    const pellet: Record<string, string[]> = {}
-    const pelletKeys = Object.keys(value.selectedPelletBuildingIds ?? {}).sort()
-    for (const key of pelletKeys) {
-        pellet[key] = sorted(value.selectedPelletBuildingIds[key] ?? [])
-    }
-
-    return {
-        merchandiseTypeId: value.merchandiseTypeId ?? '',
-        merchandiseDetail: value.merchandiseDetail ?? '',
-        selectedBuildingIds: sorted(value.selectedBuildingIds ?? []),
-        selectedPelletBuildingIds: pellet
-    }
-}
-
-function buildCurrentModel(): MerchandiseEntryData {
-    return {
-        merchandiseTypeId: selectedMerchandiseTypeId.value,
-        merchandiseDetail: merchandiseDetail.value,
-        selectedBuildingIds: [...selectedBuildingIds.value],
-        selectedPelletBuildingIds: clonePelletSelections(selectedPelletBuildingIds.value)
-    }
-}
-
-function isSameModel(left: MerchandiseEntryData, right: MerchandiseEntryData): boolean {
-    return JSON.stringify(normalizeModel(left)) === JSON.stringify(normalizeModel(right))
-}
-
-function ensurePelletKeys() {
-    for (const pelletType of pelletTypes.value) {
-        const key = String(pelletType.id)
-        if (!selectedPelletBuildingIds.value[key]) {
-            selectedPelletBuildingIds.value[key] = []
-        }
-    }
-}
-
-function hydrateFromModelValue(value: MerchandiseEntryData) {
-    isSyncing.value = true
-    try {
-        selectedMerchandiseTypeId.value = value.merchandiseTypeId ?? ''
-        merchandiseDetail.value = value.merchandiseDetail ?? ''
-        selectedBuildingIds.value = [...(value.selectedBuildingIds ?? [])]
-        selectedPelletBuildingIds.value = clonePelletSelections(
-            value.selectedPelletBuildingIds ?? {}
-        )
-        ensurePelletKeys()
-    } finally {
-        isSyncing.value = false
-    }
-}
-
-function sanitizeLocalState() {
-    if (isGranule.value) {
-        if (selectedBuildingIds.value.length > 0) {
-            selectedBuildingIds.value = []
-        }
-    } else {
-        for (const key of Object.keys(selectedPelletBuildingIds.value)) {
-            if (selectedPelletBuildingIds.value[key].length > 0) {
-                selectedPelletBuildingIds.value[key] = []
-            }
-        }
-    }
-
-    if (!isAutres.value && merchandiseDetail.value !== '') {
-        merchandiseDetail.value = ''
-    }
-}
-
-function emitCurrentModel() {
-    const currentModel = buildCurrentModel()
-    // Ne pas réémettre si rien n'a changé côté métier.
-    if (isSameModel(currentModel, props.modelValue)) {
-        return
-    }
-
-    emit('update:modelValue', currentModel)
-}
-
-watch(
-    () => props.modelValue,
-    (value) => {
-        const currentModel = buildCurrentModel()
-        // Si local == parent, on ignore pour éviter la boucle de réhydratation.
-        if (isSameModel(currentModel, value)) {
-            return
-        }
-        hydrateFromModelValue(value)
-    },
-    { immediate: true }
-)
-
-watch(
-    [selectedMerchandiseTypeId, selectedBuildingIds, selectedPelletBuildingIds, merchandiseDetail],
-    () => {
-        if (isSyncing.value || !isReady.value) {
-            return
-        }
-
-        const beforeSanitize = buildCurrentModel()
-        isSyncing.value = true
-        // Applique les règles métier (granulé / autres) avant émission.
-        sanitizeLocalState()
-        isSyncing.value = false
-
-        const afterSanitize = buildCurrentModel()
-        // Si la sanitation a modifié l'état, on laisse le watcher repasser proprement.
-        if (!isSameModel(beforeSanitize, afterSanitize)) {
-            return
-        }
-
-        emitCurrentModel()
-    },
-    { deep: true }
+    merchandiseTypes.value.find((type) => String(type.id) === selectedMerchandiseTypeId.value)
 )
+// Indique si le type est "Granulé"
+const isGranule = computed(() => selectedMerchandiseType.value?.code === MERCHANDISE_TYPE_CODES.GRANULE)
+// Indique si le type est "Autres"
+const isAutres = computed(() => selectedMerchandiseType.value?.code === MERCHANDISE_TYPE_CODES.AUTRES)

+// Charge les référentiels et hydrate le formulaire depuis la réception
 onMounted(async () => {
    const [merchandiseTypeList, buildingList, pelletTypeList] = await Promise.all([
        getMerchandiseTypeList(),
@@ -259,7 +153,106 @@ onMounted(async () => {
    buildings.value = buildingList
    pelletTypes.value = pelletTypeList

-    hydrateFromModelValue(props.modelValue)
-    isReady.value = true
+    const currentId = reception.merchandiseType?.id
+    if (currentId) {
+        selectedMerchandiseTypeId.value = String(currentId)
+    }
+    merchandiseDetail.value = reception.merchandiseDetail ?? ''
+
+    selectedBuildingIds.value =
+        reception.buildings?.map((building) => String(building.id)) ?? []
+
+    const existingPelletSelections = reception.pelletBuildings ?? []
+    const selectionMap: Record<string, string[]> = {}
+    for (const selection of existingPelletSelections) {
+        // L'API peut renvoyer les relations comme IRI ou comme objets selon le contexte.
+        const pelletTypeId = getRelationId(selection.pelletType)
+        const buildingId = getRelationId(selection.building)
+        if (!pelletTypeId || !buildingId) {
+            continue
+        }
+        if (!selectionMap[pelletTypeId]) {
+            selectionMap[pelletTypeId] = []
+        }
+        selectionMap[pelletTypeId].push(buildingId)
+    }
+    for (const pelletType of pelletTypes.value) {
+        const key = String(pelletType.id)
+        if (!selectionMap[key]) {
+            selectionMap[key] = []
+        }
+    }
+    selectedPelletBuildingIds.value = selectionMap
 })
+// Enregistre les sélections et passe à l'étape suivante
+async function validate() {
+
+    const receptionIri = `/api/receptions/${reception.id}`
+
+    await updateReception(reception.id, {
+        merchandiseDetail: isAutres.value ? merchandiseDetail.value.trim() : null,
+        buildings: isGranule.value
+            ? []
+            : selectedBuildingIds.value.map((id) => `/api/buildings/${id}`),
+        bovineDetail: null,
+        bovinesTypes: null,
+    })
+
+    if (isGranule.value) {
+        await syncPelletSelections(receptionIri)
+    } else {
+        await clearPelletSelections(receptionIri)
+    }
+}
+
+// Supprime toutes les associations granulés/bâtiments existantes
+async function clearPelletSelections(receptionIri: string) {
+    const existing = await getReceptionPelletBuildingList(receptionIri)
+    for (const selection of existing) {
+        await deleteReceptionPelletBuilding(selection.id)
+    }
+}
+// Synchronise les associations granulés/bâtiments avec l'état du formulaire
+async function syncPelletSelections(receptionIri: string) {
+    const existing = await getReceptionPelletBuildingList(receptionIri)
+    const existingMap = new Map<string, number>()
+    for (const selection of existing) {
+        // Construit la table de correspondance avec des IDs normalisés pour éviter les doublons.
+        const pelletTypeId = getRelationId(selection.pelletType)
+        const buildingId = getRelationId(selection.building)
+        if (!pelletTypeId || !buildingId) {
+            continue
+        }
+        const key = `${pelletTypeId}:${buildingId}`
+        existingMap.set(key, selection.id)
+    }
+
+    const desiredEntries: Array<{ pelletTypeId: string; buildingId: string }> = []
+    for (const [pelletTypeId, buildingIds] of Object.entries(selectedPelletBuildingIds.value)) {
+        for (const buildingId of buildingIds) {
+            desiredEntries.push({pelletTypeId, buildingId})
+        }
+    }
+
+    const desiredKeys = new Set(desiredEntries.map(
+        (entry) => `${entry.pelletTypeId}:${entry.buildingId}`
+    ))
+
+    for (const [key, id] of existingMap.entries()) {
+        if (!desiredKeys.has(key)) {
+            await deleteReceptionPelletBuilding(id)
+        }
+    }
+
+    for (const entry of desiredEntries) {
+        const key = `${entry.pelletTypeId}:${entry.buildingId}`
+        if (!existingMap.has(key)) {
+            await createReceptionPelletBuilding({
+                reception: receptionIri,
+                pelletType: `/api/pellet_types/${entry.pelletTypeId}`,
+                building: `/api/buildings/${entry.buildingId}`
+            })
+        }
+    }
+}
 </script>
--- a/frontend/components/reception/update-weight.vue
+++ b/frontend/components/reception/update-weight.vue
@@ -0,0 +1,124 @@
+<template>
+    <form @submit.prevent="validate">
+        <div class="grid grid-cols-2 gap-x-40 gap-y-8 mb-8">
+            <UiNumberInput
+                label="Dsd"
+                class="col-start-2"
+                labelClass="font-bold uppercase"
+                v-model="sharedWeightMeta.dsd"
+                :disabled="!auth.isAdmin"
+            />
+            <UiDateInput
+                label="Date pesée"
+                v-model="sharedWeightMeta.weighedAt"
+                :disabled="!auth.isAdmin"
+            />
+        </div>
+        <div class="grid grid-cols-2 gap-x-40 mb-16">
+            <UiNumberInput
+                v-for="weight in form.weights"
+                :key="weight.type"
+                :label="getWeightLabel(weight.type)"
+                labelClass="font-bold uppercase text-xl"
+                inputClass="w-24"
+                v-model="weight.weight"
+                :wrapper-class="weight.type === 'tare' ? 'col-start-1 row-start-1' : 'col-start-2 row-start-1'"
+                :disabled="!auth.isAdmin"
+                :min="0"
+                :max="48000"
+            />
+        </div>
+
+        <div class="flex justify-center">
+            <UiButton
+                v-if="auth.isAdmin"
+                type="submit"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+
+            >
+                Valider
+            </UiButton>
+        </div>
+
+    </form>
+</template>
+
+<script setup lang="ts">
+import type {ReceptionFormWeight} from '~/services/dto/reception-data'
+import {getReception} from '~/services/reception'
+import {updateWeight} from "~/services/weight";
+import {useAuthStore} from "~/stores/auth";
+
+const props = defineProps<{
+    idReception: number
+}>()
+
+const idReception = props.idReception
+const auth = useAuthStore()
+
+const form = reactive({
+    weights: [
+        {id: 0, type: 'tare' as const, weight: 0, dsd: null, weighedAt: null},
+        {id: 0, type: 'gross' as const, weight: 0, dsd: null, weighedAt: null}
+    ]
+})
+// DSD et date de pesée sont partagés entre tare et gross dans l'UI.
+const sharedWeightMeta = reactive<{
+    dsd: number | string | null
+    weighedAt: string | null
+}>({
+    dsd: null,
+    weighedAt: null
+})
+
+const getWeightLabel = (type: 'tare' | 'gross'): string => {
+    return type === 'tare' ? 'Pesée à vide' : 'Pesée à plein'
+}
+
+const hydrateFromReception = (reception: ReceptionFormWeight) => {
+    // On hydrate chaque ligne par son type (tare/gross), sans dépendre d'un index.
+    for (const receptionWeight of reception.weights) {
+        const formWeight = form.weights.find(weight => weight.type === receptionWeight.type)
+        if (formWeight) {
+            Object.assign(formWeight, receptionWeight)
+        }
+    }
+
+    // On récupère une valeur existante pour préremplir les champs partagés.
+    const weightWithMeta = reception.weights.find(weight =>
+        (weight.dsd !== null && weight.dsd !== undefined)
+        || (weight.weighedAt !== null && weight.weighedAt !== undefined && weight.weighedAt !== '')
+    )
+
+    if (weightWithMeta) {
+        sharedWeightMeta.dsd = weightWithMeta.dsd ?? null
+        sharedWeightMeta.weighedAt = weightWithMeta.weighedAt ?? null
+    }
+}
+
+onMounted(async () => {
+    const reception = await getReception(idReception)
+    hydrateFromReception(reception)
+})
+
+async function validate() {
+    const sharedDsd =
+        sharedWeightMeta.dsd === null || sharedWeightMeta.dsd === undefined || sharedWeightMeta.dsd === ''
+            ? null
+            : Number(sharedWeightMeta.dsd)
+    const sharedWeighedAt =
+        sharedWeightMeta.weighedAt === null || sharedWeightMeta.weighedAt === undefined || sharedWeightMeta.weighedAt === ''
+            ? null
+            : sharedWeightMeta.weighedAt
+    for (const weight of form.weights) {
+        if (weight.id) {
+            await updateWeight(weight.id, {
+                weight: weight.weight,
+                dsd: Number.isFinite(sharedDsd) ? sharedDsd : null,
+                weighedAt: sharedWeighedAt
+            })
+        }
+    }
+
+}
+</script>
--- a/frontend/components/shipment/shipment-form.vue
+++ b/frontend/components/shipment/shipment-form.vue
@@ -1,7 +1,8 @@
 <template>
-    <form :class="{ submitted }" @submit.prevent="validate">
-        <div class="grid grid-cols-2 h-[461px] items-start gap-y-8 gap-x-40 mb-16">
+    <form @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">Expédition</h1>
+            <!--    Nom de l'utilisateur       -->
            <UiSelect
                id="shipment-user"
                v-model="form.userId"
@@ -12,33 +13,30 @@
                }))"
                :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]">
+                <div class="flex items-end gap-8 justify-between">
                    <UiRadioGroup
                        id="shipment-type"
                        name="shipment-type"
                        label="Type d'expédition bovine"
-                        input-class="accent-primary-700 focus:ring-primary-700"
-                        wrapper-class=""
-                        group-class="flex flex-row gap-[104px] w-[160px_160px] h-[32px]"
                        v-model="selectedShipmentTypeId"
                        :options="bovineShipment.map((type) => ({
                            value: String(type.id),
                            label: type.label
                        }))"
-                        required
                    />
                    <UiNumberInput
                        id="shipment-type-quantity"
+                        label="Quantité"
                        v-model="shipmentQuantity"
                        :placeholder="0"
                        :min="0"
@@ -47,6 +45,7 @@
                    />
                </div>
            </div>
+            <!--    Client        -->
            <UiSelect
                id="shipment-customer"
                v-model="form.customerId"
@@ -57,17 +56,17 @@
                }))"
                :loading="isLoadingCustomers"
                wrapper-class="col-start-1 row-start-5"
-                required
            />
+            <!--    Adresse du client        -->
            <UiSelect
                id="shipment-address"
                v-model="form.addressId"
-                :options="addressOptions"
-                :disabled="isLoadingCustomers || ownerAddresses.length === 0"
+                :options="customerAddressOptions"
+                :disabled="isLoadingCustomers || customerAddresses.length === 0"
                label="Adresse"
                wrapper-class="col-start-2 row-start-1"
-                required
            />
+            <!--   Camion        -->
            <UiSelect
                id="shipment-truck"
                v-model="form.truckId"
@@ -78,8 +77,8 @@
                }))"
                :loading="isLoadingTrucks"
                wrapper-class="col-start-2 row-start-2"
-                required
            />
+            <!--   Transporteur        -->
            <UiSelect
                id="shipment-carrier"
                v-model="form.carrierId"
@@ -89,15 +88,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="form.licencePlate"
                    v-model:allowAny="allowAnyLicensePlate"
-                    required
                />
            </div>
+            <!--    Immatriculation (LIOT)        -->
            <UiSelect
                v-if="isLiotCarrier"
                id="shipment-vehicle"
@@ -110,8 +109,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"
@@ -123,35 +122,73 @@
                :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"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
            >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'

-const router = useRouter()
-const shipmentStore = useShipmentStore()
+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";
+import {
+    createShipmentBovine,
+    deleteShipmentBovine,
+    getBovinShipmentList,
+    updateShipmentBovine
+} from "~/services/bovin-shipment";
+
+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 submitted = 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 form = reactive<ShipmentFormData>({
    userId: '',
@@ -162,26 +199,60 @@ const form = reactive<ShipmentFormData>({
    carrierId: '',
    driverId: '',
    vehicleId: '',
-    licensePlate: '',
+    licencePlate: '',
 })
+// 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 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 loadShipmentType = async () => {
+    isLoadingShipmentTypes.value = true
+    try {
+        bovineShipment.value = await getShipmentTypeList()
+    } finally {
+        isLoadingShipmentTypes.value = false
+    }
+}

 const loadCustomers = async () => {
    isLoadingCustomers.value = true
@@ -190,53 +261,283 @@ 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?.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.licencePlate = shipment?.licencePlate ?? ''
+        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.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) : ''
-        shipmentQuantity.value = shipment?.nbBovinSend ?? 0
+        if (!shipment || !shipment.bovinShipments) {
+            selectedShipmentTypeId.value = ''
+            shipmentQuantity.value = 0
+        } else {
+            const selectedEntry = shipment.bovinShipments.find((entry) => {
+                const typeId = entry.shipmentType?.id
+                return Boolean(typeId) && Number(entry.nbBovinSend ?? 0) > 0
+            }) ?? shipment.bovinShipments.find((entry) => Boolean(entry.shipmentType?.id))
+
+            if (!selectedEntry?.shipmentType?.id) {
+                selectedShipmentTypeId.value = ''
+                shipmentQuantity.value = 0
+            } else {
+                selectedShipmentTypeId.value = String(selectedEntry.shipmentType.id)
+                shipmentQuantity.value = selectedEntry.nbBovinSend ?? 0
+            }
+        }
        isHydrating.value = false
    },
-    { immediate: true }
+    {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}
 )
-
-// Extra watcher for LIOT defaults after hydration
 watch(
    () => isHydrating.value,
    (value) => {
-        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)
-            }
+        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.licencePlate = selected.plate
+            allowAnyLicensePlate.value = false
+        }
+    }
+)
+watch(
+    () => [form.licencePlate, form.carrierId, vehicles.value],
+    () => {
+        if (!isLiotCarrier.value || form.vehicleId) {
+            return
+        }
+        const match = filteredVehicles.value.find(
+            (vehicle) => vehicle.plate === form.licencePlate
+        )
+        if (match) {
+            form.vehicleId = String(match.id)
+        }
+    }
+)
+const buildDesiredBovinShipments = () => {
+    const typeId = Number(selectedShipmentTypeId.value)
+    if (!Number.isFinite(typeId)) {
+        return []
+    }
+    const type = bovineShipment.value.find((entry) => entry.id === typeId)
+    if (!type) {
+        return []
+    }
+    const raw = shipmentQuantity.value
+    const quantity = raw === null || raw === undefined ? 0 : Number(raw)
+    const normalizedQuantity = Number.isFinite(quantity) ? Math.max(0, Math.trunc(quantity)) : 0
+    if (normalizedQuantity <= 0) {
+        return []
+    }

-onMounted(async () => {
-    bovineShipment.value = await getShipmentTypeList()
-    await loadCustomers()
-    await loadCommonData()
-    await loadVehicles()
-    await loadDrivers()
-})
+    return [{type, quantity: normalizedQuantity}]
+}
+const syncBovinShipments = async (
+    shipmentId: number,
+    existing: Array<{ id?: number; nbBovinSend: number | null; shipmentType?: unknown }> = []
+) => {
+    const shipmentIri = `/api/shipments/${shipmentId}`
+    const desired = buildDesiredBovinShipments()
+    const desiredByTypeId = new Map<number, number>()
+    for (const entry of desired) {
+        desiredByTypeId.set(entry.type.id, entry.quantity)
+    }
+    for (const entry of existing) {
+        if (!entry.id) {
+            continue
+        }
+        const rawType = entry.shipmentType
+        let typeId: number | null = null
+        if (rawType && typeof rawType === 'object' && 'id' in rawType) {
+            typeId = Number((rawType as { id: number }).id)
+        } else if (typeof rawType === 'string') {
+            const match = rawType.match(/\/shipment_types\/(\\d+)$/)
+            typeId = match ? Number(match[1]) : null
+        }
+        if (!typeId) {
+            continue
+        }
+        const desiredQuantity = desiredByTypeId.get(typeId)
+        if (!desiredQuantity) {
+            await deleteShipmentBovine(entry.id)
+            continue
+        }
+        if (entry.nbBovinSend !== desiredQuantity) {
+            await updateShipmentBovine(entry.id, {nbBovinSend: desiredQuantity})
+        }
+        desiredByTypeId.delete(typeId)
+    }

+    for (const [typeId, quantity] of desiredByTypeId.entries()) {
+        await createShipmentBovine({
+            shipment: shipmentIri,
+            shipmentType: `/api/shipment_types/${typeId}`,
+            nbBovinSend: quantity
+        })
+    }
+}
 const buildPayload = () => {
-    const normalizedLicensePlate = form.licensePlate.trim()
+    const normalizedLicensePlate = form.licencePlate.trim()
    const normalizedShipmentDate = form.shipmentDate.trim()
    const normalizedCustomerId = form.customerId.trim()
    const normalizedTruckId = form.truckId.trim()
@@ -244,50 +545,62 @@ 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 normalizedShipmentTypeId = selectedShipmentTypeId.value.trim()
-    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 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

    return {
-        licensePlate: normalizedLicensePlate,
+        licencePlate: normalizedLicensePlate,
        shipmentDate: normalizedShipmentDate,
        customer: customerIri,
        truck: truckIri,
        carrier: carrierIri,
        driver: driverIri,
        user: userIri,
-        address: addressIri,
-        shipmentType: shipmentTypeIri,
-        nbBovinSend: normalizedQuantity,
+        address: addressIri
    }
 }

 const saveDraft = async () => {
    const payload = buildPayload()
    if (!shipmentStore.current) {
-        await shipmentStore.createShipment({
+        const created = await shipmentStore.createShipment({
            currentStep: 0,
            ...payload
        })
+        if (created) {
+            await syncBovinShipments(created.id, [])
+        }
        return
    }
+
    await shipmentStore.updateShipment(shipmentStore.current.id, {
        currentStep: shipmentStore.current.currentStep,
        ...payload
    })
+    await syncBovinShipments(
+        shipmentStore.current.id,
+        shipmentStore.current?.bovinShipments ?? []
+    )
 }

-defineExpose({ saveDraft })
-
+defineExpose({saveDraft})
+// Valide le formulaire et crée/met à jour l'expédition
 const validate = async () => {
    const payload = buildPayload()
    if (!shipmentStore.current) {
@@ -297,6 +610,7 @@ const validate = async () => {
        })
        if (created) {
            await shipmentStore.loadShipment(created.id)
+            await syncBovinShipments(created.id, shipmentStore.current?.bovinShipments ?? [])
            await router.push(`/shipment/${created.id}`)
        }
        return
@@ -307,5 +621,6 @@ const validate = async () => {
        ...payload
    })
    await shipmentStore.loadShipment(shipmentStore.current.id)
+    await syncBovinShipments(shipmentStore.current.id, shipmentStore.current?.bovinShipments ?? [])
 }
 </script>
--- a/frontend/components/shipment/shipment-loading.vue
+++ b/frontend/components/shipment/shipment-loading.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="flex flex-col items-center gap-[150px]">
-        <h1 class="font-bold text-5xl uppercase text-primary-500">Chargement des bovins</h1>
+    <div class="flex flex-col items-center gap-[118px]">
+        <h1 class="font-bold text-5xl uppercase text-primary-500">Charment des bovins</h1>
        <div
            class="w-full flex flex-col items-center justify-center">
            <UiLoadingDots />
--- a/frontend/components/shipment/shipment-weight.vue
+++ b/frontend/components/shipment/shipment-weight.vue
@@ -0,0 +1,101 @@
+<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="showLoadingBox"
+                class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[86px]">
+                    <UiLoadingDots />
+            </div>
+            <div v-else-if="displayWeight !== null" class="w-full">
+                <div
+                    class="w-full flex flex-col items-center justify-center border border-primary-500 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, onMounted } 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.licencePlate ?? '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('/')
+}
+
+// Récupère le poids dès l'arrivée sur l'écran
+onMounted(() => {
+    if (displayWeight.value === null) {
+        fetchWeight()
+    }
+})
+</script>
--- a/frontend/components/ui/UiButton.vue
+++ b/frontend/components/ui/UiButton.vue
@@ -3,7 +3,7 @@
        :is="'button'"
        :type="type"
        :disabled="isDisabled"
-        class="inline-flex min-w-[194px] items-center justify-center rounded-md"
+        class="inline-flex items-center justify-center rounded-md"
        :class="[
            isDisabled ? 'cursor-not-allowed opacity-60' : 'cursor-pointer',
            buttonClass
--- a/frontend/components/ui/UiCheckbox.vue
+++ b/frontend/components/ui/UiCheckbox.vue
@@ -1,14 +1,14 @@
 <template>
    <div :class="wrapperClass">
        <label
-            class="flex items-center gap-2 cursor-pointer text-primary-700"
+            class="flex items-center gap-2 cursor-pointer text-primary-500"
            :class="labelClass"
        >
            <input
                type="checkbox"
                :checked="checked"
                :disabled="disabled"
-                :class="['h-4 w-4 cursor-pointer text-primary-500', inputClass]"
+                :class="['cursor-pointer text-primary-500', inputClass]"
                @change="onChange"
            >
            <span v-if="label">{{ label }}</span>
--- a/frontend/components/ui/UiDataTable.vue
+++ b/frontend/components/ui/UiDataTable.vue
@@ -0,0 +1,436 @@
+<template>
+    <div class="mt-6 mx-[6px]">
+        <table class="w-full border border-slate-300 table-fixed">
+            <thead class="bg-slate-100 capitalize tracking-wide">
+            <tr>
+                <th
+                    v-for="column in normalizedColumns"
+                    :key="column.key"
+                    class="border border-slate-300 px-2 py-1"
+                >
+                    <div class="flex flex-col gap-1">
+                        <UiSelect
+                            v-if="column.isSearchable && column.type === 'selectTypeReception'"
+                            v-model="searchValues[column.key]"
+                            :placeholder="column.label"
+                            select-class="w-full !text-sm !py-1"
+                            :options="[
+                                    { value: '__all__', label: 'Tous' },
+                                    ...receptionTypes.map((type) => ({
+                                        value: type.label,
+                                        label: type.label
+                                    }))
+                                ]"
+                        />
+                        <UiSelect
+                            v-else-if="column.isSearchable && column.type === 'selectTypeShipment'"
+                            v-model="searchValues[column.key]"
+                            :placeholder="column.label"
+                            select-class="w-full !text-sm !py-1"
+                            :options="[
+                                    { value: '__all__', label: 'Tous' },
+                                    ...shipmentTypes.map((type) => ({
+                                        value: type.label,
+                                        label: type.label
+                                    }))
+                                ]"
+                        />
+                        <div v-else-if="column.isSearchable" class="relative">
+                            <UiTextInput
+                                v-model="searchValues[column.key]"
+                                :placeholder="column.label"
+                                input-class="min-w-full !text-sm !py-1 !pr-7"
+                            />
+                            <Icon
+                                name="gg:search"
+                                class="pointer-events-none absolute right-2 top-1/2 -translate-y-1/2 text-slate-400"
+                            />
+                        </div>
+                        <span v-else>{{ column.label }}</span>
+                    </div>
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr v-if="loading">
+                <td
+                    class="border border-slate-300 px-2 py-2 whitespace-pre-line"
+                    :colspan="normalizedColumns.length || 1"
+                >
+                    Chargement...
+                </td>
+            </tr>
+            <tr v-else-if="displayedRows.length === 0">
+                <td
+                    class="border border-slate-300 px-3 py-2 text-left text-slate-500"
+                    :colspan="normalizedColumns.length || 1"
+                >
+                    Aucune donnée
+                </td>
+            </tr>
+            <template v-else>
+                <tr
+                    v-for="(row, rowIndex) in displayedRows"
+                    class="hover:bg-primary-500 hover:bg-opacity-15"
+                    :key="rowIndex"
+                    :class="props.rowClickable ? 'cursor-pointer' : ''"
+                    @click="props.rowClickable ? onRowClick(row) : null"
+                >
+                    <td
+                        v-for="column in normalizedColumns"
+                        :key="column.key"
+                        class="border border-slate-300 px-2 py-2 whitespace-pre-line "
+                    >
+                        {{ formatColumnValue(row, column) }}
+                    </td>
+                </tr>
+            </template>
+            </tbody>
+        </table>
+
+        <div class="flex items-center justify-between mt-4">
+            <p class="text-slate-600">
+                {{ pageLabel }}
+            </p>
+            <div class="flex items-center gap-2">
+                <button
+                    type="button"
+                    class="rounded border border-slate-300 px-2 py-1 disabled:cursor-not-allowed disabled:opacity-50"
+                    :disabled="currentPage <= 1 || loading"
+                    @click="currentPage = currentPage - 1"
+                >
+                    Précédent
+                </button>
+                <button
+                    v-for="(item, index) in paginationItems"
+                    :key="`${item}-${index}`"
+                    type="button"
+                    class="min-w-9 rounded border px-2 py-1"
+                    :class="item === currentPage
+                            ? 'border-primary-500 bg-primary-500 text-white'
+                            : 'border-slate-300'"
+                    :disabled="loading || item === '...'"
+                    @click="typeof item === 'number' ? (currentPage = item) : null"
+                >
+                    {{ item }}
+                </button>
+
+                <button
+                    type="button"
+                    class="rounded border border-slate-300 px-2 py-1 disabled:cursor-not-allowed disabled:opacity-50"
+                    :disabled="currentPage >= totalPages || loading"
+                    @click="currentPage = currentPage + 1"
+                >
+                    Suivant
+                </button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import {Row, ColumnConfig, AnyCollection, PaginationItem} from '~/services/dto/datatable-data'
+import {useApi} from '~/composables/useApi'
+import type {ReceptionTypeData} from '~/services/dto/reception-type-data'
+import {getReceptionTypeList} from '~/services/reception-type'
+import type {ShipmentTypeData} from "~/services/dto/shipment-data";
+import {getShipmentTypeList} from "~/services/shipment-type";
+
+const api = useApi()
+const receptionTypes = ref<ReceptionTypeData[]>([])
+const shipmentTypes = ref<ShipmentTypeData[]>([])
+const loading = ref(false)
+const currentPage = ref(1)
+const rows = ref<Row[]>([])
+const total = ref(0)
+const searchValues = reactive<Record<string, string>>({})
+const isNestedMode = computed(() => Boolean(props.responsePath))
+const effectiveTotal = computed(() => total.value)
+const emit = defineEmits<{
+    rowClick: [row: Row]
+}>()
+
+const props = withDefaults(defineProps<{
+    url?: string
+    responsePath?: string
+    columns?: ColumnConfig[]
+    query?: Record<string, unknown>
+    itemsPerPage?: number
+    rowClickable?: boolean
+}>(), {
+    url: '',
+    responsePath: '',
+    columns: () => [],
+    query: () => ({}),
+    itemsPerPage: 10,
+    rowClickable: true
+})
+const displayedRows = computed<Row[]>(() => {
+    if (!isNestedMode.value) return rows.value
+
+    const startIndex = (currentPage.value - 1) * props.itemsPerPage
+    const endIndex = startIndex + props.itemsPerPage
+    return rows.value.slice(startIndex, endIndex)
+})
+onMounted(async () => {
+    receptionTypes.value = await getReceptionTypeList()
+    shipmentTypes.value = await getShipmentTypeList()
+
+})
+const normalizedColumns = computed(() => {
+    if (props.columns.length > 0) {
+        return props.columns.map((column) => ({
+            key: column.key,
+            label: column.label ?? column.key,
+            format: column.format,
+            isSearchable: column.isSearchable ?? false,
+            type: column.type
+        }))
+    }
+
+    if (displayedRows.value.length === 0) {
+        return []
+    }
+
+    return Object.keys(displayedRows.value[0])
+        .filter((key) => !key.startsWith('@'))
+        .map((key) => ({
+            key,
+            label: key
+        }))
+})
+
+const totalPages = computed(() => Math.max(1, Math.ceil(effectiveTotal.value / props.itemsPerPage)))
+
+function getVisiblePages(page: number, lastPage: number): number[] {
+    const candidates = new Set([1, page - 1, page, page + 1, lastPage])
+    return Array.from(candidates)
+        .filter((p) => p >= 1 && p <= lastPage)
+        .sort((a, b) => a - b)
+}
+
+function insertEllipses(sortedPages: number[]): PaginationItem[] {
+    const items: PaginationItem[] = []
+
+    for (let i = 0; i < sortedPages.length; i++) {
+        const current = sortedPages[i]
+        const previous = sortedPages[i - 1]
+        if (previous != null && current - previous > 1) {
+            items.push('...')
+        }
+        items.push(current)
+    }
+    return items
+}
+
+const paginationItems = computed<PaginationItem[]>(() => {
+    const pages = getVisiblePages(currentPage.value, totalPages.value)
+    return insertEllipses(pages)
+})
+
+const pageLabel = computed(() => {
+    if (!effectiveTotal.value) return '0 résultat'
+
+    const start = (currentPage.value - 1) * props.itemsPerPage + 1
+    const end = Math.min(currentPage.value * props.itemsPerPage, effectiveTotal.value)
+
+    return `${start}-${end} sur ${effectiveTotal.value}`
+})
+
+watch(
+    () => [props.url, props.itemsPerPage, JSON.stringify(props.query ?? {}), props.responsePath],
+    async () => {
+        if (currentPage.value !== 1) {
+            currentPage.value = 1
+            if (!isNestedMode.value) return
+        }
+        await loadPage()
+    },
+    {immediate: true}
+)
+
+let timeout: ReturnType<typeof setTimeout>
+
+watch(
+    () => ({...searchValues}),
+    () => {
+        clearTimeout(timeout)
+        timeout = setTimeout(() => {
+            currentPage.value = 1
+            if (!isNestedMode.value) loadPage()
+        }, 750)
+    },
+    {deep: true}
+)
+
+watch(
+    () => currentPage.value,
+    async () => {
+        if (isNestedMode.value) return
+        await loadPage()
+    }
+)
+
+watch(
+    () => [totalPages.value, currentPage.value],
+    () => {
+        if (currentPage.value > totalPages.value) {
+            currentPage.value = totalPages.value
+        }
+    },
+    {immediate: true}
+)
+
+function buildDateInterval(value: string): { after: string; before: string } | null {
+    const trimmed = value.trim()
+
+    // YYYY
+    if (/^\d{4}$/.test(trimmed)) {
+        const year = Number(trimmed)
+        return {
+            after: `${year}-01-01`,
+            before: `${year + 1}-01-01`
+        }
+    }
+
+    // YYYY-MM
+    if (/^\d{4}-\d{2}$/.test(trimmed)) {
+        const [year, month] = trimmed.split('-').map(Number)
+
+        const nextMonth = month === 12 ? 1 : month + 1
+        const nextYear = month === 12 ? year + 1 : year
+
+        return {
+            after: `${year}-${String(month).padStart(2, '0')}-01`,
+            before: `${nextYear}-${String(nextMonth).padStart(2, '0')}-01`
+        }
+    }
+
+    // YYYY-MM-DD
+    if (/^\d{4}-\d{2}-\d{2}$/.test(trimmed)) {
+        const date = new Date(`${trimmed}T00:00:00`)
+        const nextDay = new Date(date)
+        nextDay.setDate(date.getDate() + 1)
+
+        const yyyy = nextDay.getFullYear()
+        const mm = String(nextDay.getMonth() + 1).padStart(2, '0')
+        const dd = String(nextDay.getDate()).padStart(2, '0')
+
+        return {
+            after: trimmed,
+            before: `${yyyy}-${mm}-${dd}`
+        }
+    }
+
+    return null
+}
+
+
+// Construit la requête, charge les données et normalise la réponse, puis met à jour rows et total
+async function loadPage(): Promise<void> {
+    if (!props.url) {
+        rows.value = []
+        total.value = 0
+        return
+    }
+
+    loading.value = true
+
+    try {
+        if (isNestedMode.value) {
+            const response = await api.get<Row>(props.url, props.query, {
+                headers: {
+                    Accept: 'application/ld+json'
+                }
+            })
+            const nestedRows = readPath(response, props.responsePath)
+            rows.value = Array.isArray(nestedRows) ? nestedRows as Row[] : []
+            total.value = rows.value.length
+            return
+        }
+        const searchQuery: Record<string, string> = {}
+
+        for (const column of normalizedColumns.value) {
+            if (!column.isSearchable) continue
+
+            const rawValue = searchValues[column.key] ?? ''
+            const raw = rawValue === '__all__' ? '' : rawValue.trim()
+            if (!raw) continue
+
+            const paramBase = column.key
+
+            if (column.type === 'date') {
+                const interval = buildDateInterval(raw)
+
+                if (interval) {
+                    searchQuery[`${paramBase}[after]`] = interval.after
+                    searchQuery[`${paramBase}[before]`] = interval.before
+                }
+
+                continue
+            }
+
+            searchQuery[paramBase] = raw
+        }
+
+        const requestQuery: Record<string, unknown> = {
+            ...props.query,
+            ...searchQuery,
+            page: currentPage.value,
+            itemsPerPage: props.itemsPerPage,
+        }
+
+        const response = await api.get<AnyCollection<Row> | Row[]>(props.url, requestQuery, {
+            headers: {
+                Accept: 'application/ld+json'
+            }
+        })
+
+        if (Array.isArray(response)) {
+            rows.value = response
+            total.value = response.length
+            return
+        }
+
+        const mappedRows = response['hydra:member'] ?? response.member ?? response.items ?? []
+        rows.value = Array.isArray(mappedRows) ? mappedRows : []
+        total.value = Number(response['hydra:totalItems'] ?? response.totalItems ?? rows.value.length)
+    } finally {
+        loading.value = false
+    }
+}
+
+function onRowClick(row: Row): void {
+    emit('rowClick', row)
+}
+
+// Lit une valeur imbriquée dans une ligne à partir d'un chemin de type "objet.sousObjet.cle".
+function readPath(source: Row, path: string): unknown {
+    return path.split('.').reduce<unknown>((acc, key) => (acc as Row | undefined)?.[key], source)
+}
+
+// Formate une valeur brute pour l'affichage dans une cellule (vide, tableau, objet ou valeur simple).
+function formatCell(value: unknown): string {
+    if (value == null || value === '') return '-'
+
+    if (Array.isArray(value)) return value.length ? value.map(formatCell).join(', ') : '-'
+
+    if (typeof value === 'object') {
+        const objectValue = value as Row
+        return String(objectValue.label ?? objectValue.name ?? objectValue.code ?? objectValue.id ?? '[object]')
+    }
+    return String(value)
+}
+
+function formatColumnValue(
+    row: Row,
+    column: { key: string; format?: (value: unknown, row: Row) => string }
+): string {
+    const value = readPath(row, column.key)
+    if (column.format) {
+        return column.format(value, row)
+    }
+
+    return formatCell(value)
+}
+</script>
--- a/frontend/components/ui/UiDateInput.vue
+++ b/frontend/components/ui/UiDateInput.vue
@@ -3,7 +3,7 @@
        <label
            v-if="label"
            :for="id"
-            class="font-bold uppercase text-xl text-primary-700"
+            class="font-bold uppercase text-xl text-primary-500"
            :class="labelClass"
        >
            {{ label }}
@@ -14,9 +14,9 @@
            :value="modelValue ?? ''"
            :disabled="disabled"
            v-bind="attrs"
-            class="border-b border-primary-700 justify-self-start text-xl text-primary-700 py-[6px] uppercase bg-transparent appearance-none h-[34px]"
+            class="border-b border-black justify-self-start text-xl text-primary-500 py-[6px] uppercase bg-transparent appearance-none h-[34px]"
            :class="[
-                isEmpty ? 'text-neutral-400' : 'text-primary-700',
+                isEmpty ? 'text-neutral-400' : 'text-black',
                disabled ? 'cursor-not-allowed' : 'cursor-pointer',
                inputClass
            ]"
--- a/frontend/components/ui/UiNumberInput.vue
+++ b/frontend/components/ui/UiNumberInput.vue
@@ -1,10 +1,9 @@
-// flex row passer en class wraper class flex col ainsi que le wfull 34
 <template>
-    <div :class="['flex', wrapperClass]">
+    <div :class="['flex flex-row items-center gap-2', wrapperClass]">
        <label
            v-if="label"
            :for="id"
-            class="text-xl flex items-center gap-2 text-primary-700"
+            class="text-xl flex items-center gap-2 text-primary-500"
            :class="labelClass"
        >
            <span
@@ -26,7 +25,7 @@
            :step="step"
            :disabled="disabled"
            v-bind="attrs"
-            class="border-b border-primary-700 justify-self-start text-xl text-primary-700 py-[6px] uppercase bg-transparent appearance-none h-[34px]"
+            class="border-b border-black text-xl bg-transparent w-16 text-primary-500"
            :class="[
                isEmpty ? 'text-neutral-400' : 'text-black',
                disabled ? 'cursor-not-allowed' : 'cursor-text',
--- a/frontend/components/ui/UiRadioGroup.vue
+++ b/frontend/components/ui/UiRadioGroup.vue
@@ -2,7 +2,7 @@
    <div :class="['flex flex-col', wrapperClass]">
        <label
            v-if="label"
-            class="font-bold uppercase text-xl text-primary-700"
+            class="font-bold uppercase text-xl text-primary-500"
            :class="labelClass"
        >
            {{ label }}
@@ -16,7 +16,7 @@
                v-for="option in options"
                :key="String(option.value)"
                :for="`${id || 'radio'}-${option.value}`"
-                class="flex items-center gap-2 text-primary-700"
+                class="flex items-center gap-2 text-primary-500"
                :class="itemClass"
            >
                <input
@@ -27,7 +27,7 @@
                    :checked="String(modelValue ?? '') === String(option.value)"
                    :disabled="disabled"
                    v-bind="attrs"
-                    class="h-4 w-4 border-primary-700/50 text-primary-700 focus:ring-primary-700"
+                    class="h-4 w-4 border-slate-300 text-primary-500 focus:ring-primary-500"
                    :class="[
                        disabled ? 'cursor-not-allowed' : 'cursor-pointer',
                        inputClass
--- a/frontend/components/ui/UiSelect.vue
+++ b/frontend/components/ui/UiSelect.vue
@@ -3,7 +3,7 @@
        <label
            v-if="label"
            :for="id"
-            class="font-bold uppercase text-xl text-primary-700"
+            class="font-bold uppercase text-xl text-primary-500"
            :class="labelClass"
        >
            {{ label }}
@@ -13,9 +13,9 @@
            :value="modelValue ?? ''"
            :disabled="disabled || loading"
            v-bind="attrs"
-            class="border-b border-primary-700 justify-self-start text-xl text-primary-700 py-[6px] bg-transparent"
+            class="border-b border-black justify-self-start text-xl text-primary-500 py-[6px] bg-transparent"
            :class="[
-                isEmpty ? 'text-neutral-400' : 'text-primary-700',
+                isEmpty ? 'text-neutral-400' : 'text-black',
                disabled || loading ? 'cursor-not-allowed' : 'cursor-pointer',
                selectClass
            ]"
@@ -28,7 +28,7 @@
                v-for="option in options"
                :key="option.value"
                :value="option.value"
-                class="text-primary-700"
+                class="text-black"
            >
                {{ option.label }}
            </option>
--- a/frontend/components/ui/UiTextInput.vue
+++ b/frontend/components/ui/UiTextInput.vue
@@ -3,7 +3,7 @@
        <label
            v-if="label"
            :for="id"
-            class="font-bold uppercase text-xl text-primary-700"
+            class="font-bold uppercase text-xl text-primary-500"
            :class="labelClass"
        >
            {{ label }}
@@ -16,7 +16,7 @@
            :maxlength="maxlength"
            :disabled="disabled"
            v-bind="attrs"
-            class="border-b border-black text-xl py-[6px] bg-transparent text-primary-700"
+            class="border-b border-black text-xl py-[6px] bg-transparent text-primary-500"
            :class="[
                isEmpty ? 'text-neutral-400' : 'text-black',
                disabled ? 'cursor-not-allowed' : 'cursor-text',
--- a/frontend/components/ui/license-plate-input.vue
+++ b/frontend/components/ui/license-plate-input.vue
@@ -9,7 +9,6 @@
              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"
          />
@@ -33,14 +32,12 @@ type Props = {
  allowAny?: boolean
  label?: string
  id?: string
-  required?: boolean
 }

 const props = withDefaults(defineProps<Props>(), {
  allowAny: false,
  label: 'Immatriculation',
-  id: 'license-plate',
-  required: false
+  id: 'license-plate'
 })

 const emit = defineEmits<{
--- a/frontend/components/workflow/workflow-liot-fields.vue
+++ b/frontend/components/workflow/workflow-liot-fields.vue
@@ -1,57 +0,0 @@
-<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>
--- a/frontend/components/workflow/workflow-waiting-list.vue
+++ b/frontend/components/workflow/workflow-waiting-list.vue
@@ -1,72 +0,0 @@
-<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>
--- a/frontend/components/workflow/workflow-weight.vue
+++ b/frontend/components/workflow/workflow-weight.vue
@@ -1,78 +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>
-            <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>
--- a/frontend/composables/steps/useWeighingStep.ts
+++ b/frontend/composables/steps/useWeighingStep.ts
@@ -1,77 +0,0 @@
-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
-    }
-}
--- a/frontend/composables/useAddressSync.ts
+++ b/frontend/composables/useAddressSync.ts
@@ -1,54 +0,0 @@
-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 }
-}
--- a/frontend/composables/useFormDataLoading.ts
+++ b/frontend/composables/useFormDataLoading.ts
@@ -1,73 +0,0 @@
-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
-    }
-}
--- a/frontend/composables/useLiotHandling.ts
+++ b/frontend/composables/useLiotHandling.ts
@@ -1,153 +0,0 @@
-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
-    }
-}
--- a/frontend/composables/useWeighing.ts
+++ b/frontend/composables/useWeighing.ts
@@ -1,64 +1,57 @@
-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'
+import type {Ref} from 'vue'
+import {computed, ref} from 'vue'
+import type {ReceptionData, ReceptionPayload, 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";

 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,
-    entity,
-    entityName,
-    apiResource,
-    titleLabel,
-    getWeightFromScale,
-    updateEntity,
-    loadEntity
-}: UseWeighingOptions) => {
+                                mode,
+                                reception,
+                                updateReception,
+                                loadReception
+                            }: UseWeighingOptions) => {
    const weightData = ref<WeightData | null>(null)
    const isFetching = ref(false)

    const currentWeightEntry = computed<WeightEntryData | null>(() => {
-        const weights = entity.value?.weights ?? []
+        const weights = reception.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(() => titleLabel)
-    const showLoadingBox = computed(() => isFetching.value)
+    const title = computed(() => (mode === 'gross' ? 'Pesée à plein' : 'Pesée à vide'))
+    const showLoadingBox = computed(
+        () => isFetching.value || (displayWeight.value === null && currentWeightEntry.value === null)
+    )

    const fetchWeight = async () => {
        isFetching.value = true
-        weightData.value = await getWeightFromScale().finally(() => {
+        weightData.value = await getWeight().finally(() => {
            isFetching.value = false
        })
    }

    const saveWeight = async () => {
-        if (!entity.value) return
+        if (!reception.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
-
-        const relationPayload: Record<string, string> = {}
-        relationPayload[entityName] = `/api/${apiResource}/${entity.value.id}`
+        if (baseWeight === null) {
+            return
+        }

        if (existingEntry?.id) {
            await updateWeight(existingEntry.id, {
@@ -69,7 +62,7 @@ export const useWeighing = ({
            })
        } else {
            await createWeight({
-                ...relationPayload,
+                reception: `api/receptions/${reception.value.id}`,
                type: mode,
                dsd: baseDsd,
                weight: baseWeight,
@@ -78,15 +71,15 @@ export const useWeighing = ({
        }

        const nextStep = mode === 'tare'
-            ? entity.value.currentStep
-            : entity.value.currentStep + 1
-        await updateEntity(entity.value.id, {
+            ? reception.value.currentStep
+            : reception.value.currentStep + 1
+        await updateReception(reception.value.id, {
            currentStep: nextStep,
-            isValid: entity.value.isValid
+            isValid: reception.value.isValid
        })

-        if (loadEntity) {
-            await loadEntity(entity.value.id)
+        if (loadReception) {
+            await loadReception(reception.value.id)
        }
    }

@@ -102,29 +95,86 @@ export const useWeighing = ({
    }
 }

-// Backward-compatible aliases
 export const useWeighingShipment = ({
-    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
+                                        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
    })
+
+    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 à plein' : 'Pesée à vide'))
+    const showLoadingBox = computed(
+        () => isFetching.value || (displayWeight.value === null && currentWeightEntry.value === null)
+    )
+
+    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
+    }
 }
--- a/frontend/composables/useWorkflowSteps.ts
+++ b/frontend/composables/useWorkflowSteps.ts
@@ -1,83 +0,0 @@
-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
-    }
-}
--- a/frontend/config/reception.config.ts
+++ b/frontend/config/reception.config.ts
@@ -1,25 +0,0 @@
-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)
--- a/frontend/config/shipment.config.ts
+++ b/frontend/config/shipment.config.ts
@@ -1,25 +0,0 @@
-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)
--- a/frontend/constants/steps.ts
+++ b/frontend/constants/steps.ts
@@ -0,0 +1,22 @@
+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,
+]
--- a/frontend/i18n/locales/fr.json
+++ b/frontend/i18n/locales/fr.json
@@ -12,7 +12,6 @@
            "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": {
@@ -23,7 +22,6 @@
            "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": {
@@ -84,10 +82,7 @@
            "list": "Impossible de récupérer la liste des camions."
        },
        "bovin": {
-            "list": "Impossible de récupérer la liste des races de bovins.",
-            "fetch": "Impossible de récupérer le type bovin.",
-            "create": "Impossible de créer le type bovin.",
-            "update": "Impossible de mettre à jour le type bovin."
+            "list": "Impossible de récupérer la liste des races de bovins."
        },
        "carrier": {
            "list": "Impossible de récupérer la liste des transporteurs.",
@@ -111,14 +106,10 @@
    },
    "success": {
        "reception": {
-            "create": "Réception créée avec succès",
-            "update": "Réception mise à jour avec succès.",
-            "delete": "Réception supprimée avec succès."
+            "update": "Réception mise à jour avec succès."
        },
        "shipment": {
-            "create": "Éxpedition créée avec succès",
-            "update": "Éxpedition mise à jour avec succès.",
-            "delete": "Expédition supprimée avec succès."
+            "update": "Éxpedition mise à jour avec succès."
        },
        "supplier": {
            "create": "Fournisseur créé avec succès.",
@@ -142,10 +133,6 @@
            "update": "Transporteur mis à jour",
            "create": "Transporteur créé"
        },
-        "bovin": {
-            "update": "Type bovin mis à jour avec succès.",
-            "create": "Type bovin créé avec succès."
-        },
        "weight": {
            "update": "Pesée mis à jour"
        }
--- a/frontend/layouts/default.vue
+++ b/frontend/layouts/default.vue
@@ -38,23 +38,6 @@
                        </a>
                    </NuxtLink>

-                    <NuxtLink
-                        v-if="auth.isAdmin"
-                        to="/admin/user/list"
-                        custom
-                        v-slot="{ href, navigate }"
-                    >
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/user')
-                            ? 'opacity-100'
-                            : 'opacity-65 hover:opacity-100 transition'"
-                        >
-                            Utilisateurs
-                        </a>
-                    </NuxtLink>
-
                    <NuxtLink
                        v-if="auth.isAdmin"
                        to="/admin/supplier/supplier-list"
@@ -72,23 +55,6 @@
                        </a>
                    </NuxtLink>

-                    <NuxtLink
-                        v-if="auth.isAdmin"
-                        to="/admin/customer/customer-list"
-                        custom
-                        v-slot="{ href, navigate }"
-                    >
-                        <a
-                            :href="href"
-                            @click="navigate"
-                            :class="route.path.startsWith('/admin/customer')
-                            ? 'opacity-100'
-                            : 'opacity-65 hover:opacity-100 transition'"
-                        >
-                            Clients
-                        </a>
-                    </NuxtLink>
-
                    <NuxtLink
                        v-if="auth.isAdmin"
                        to="/admin/carrier/carrier-list"
@@ -108,7 +74,41 @@

                    <NuxtLink
                        v-if="auth.isAdmin"
-                        to="/admin/bovin/bovin-list"
+                        to="/admin/user/list"
+                        custom
+                        v-slot="{ href, navigate }"
+                    >
+                        <a
+                            :href="href"
+                            @click="navigate"
+                            :class="route.path.startsWith('/admin/user')
+                            ? 'opacity-100'
+                            : 'opacity-65 hover:opacity-100 transition'"
+                        >
+                            Utilisateurs
+                        </a>
+                    </NuxtLink>
+
+                    <NuxtLink
+                        v-if="auth.isAdmin"
+                        to="/admin/customer/customer-list"
+                        custom
+                        v-slot="{ href, navigate }"
+                    >
+                        <a
+                            :href="href"
+                            @click="navigate"
+                            :class="route.path.startsWith('/admin/customer')
+                            ? 'opacity-100'
+                            : 'opacity-65 hover:opacity-100 transition'"
+                        >
+                            Clients
+                        </a>
+                    </NuxtLink>
+
+                    <NuxtLink
+                        v-if="auth.isAdmin"
+                        to="/admin/bovin/list"
                        custom
                        v-slot="{ href, navigate }"
                    >
@@ -134,8 +134,7 @@
                        class="inline-flex items-center py-2 -my-2 text-xl leading-none transition hover:opacity-80"
                        aria-haspopup="true"
                    >
-                        <Icon name="mdi:account-circle-outline" class="self-center" size="36"/>
-                        <span class="capitalize font-bold ml-4">{{ userDisplayName }}</span>
+                        <span class="capitalize font-bold">{{ userDisplayName }}</span>
                        <span
                            class="ml-[6px] inline-flex items-center font-bold transition-transform group-hover:rotate-180 group-focus-within:rotate-180">
                            <Icon name="mdi:chevron-down" size="20"/>
@@ -215,7 +214,7 @@
                        <NuxtLink v-if="auth.isAdmin" to="/admin/customer/customer-list" @click="closeMenu">
                            Clients
                        </NuxtLink>
-                        <NuxtLink v-if="auth.isAdmin" to="/admin/bovin/bovin-list" @click="closeMenu">
+                        <NuxtLink v-if="auth.isAdmin" to="/admin/bovin/list" @click="closeMenu">
                            Bovins
                        </NuxtLink>
                    </nav>
--- a/frontend/nuxt.config.ts
+++ b/frontend/nuxt.config.ts
@@ -15,8 +15,7 @@ export default defineNuxtConfig({
  css: ['~/assets/css/main.css', '~/assets/css/toast.css'],
  runtimeConfig: {
    public: {
-      apiBase: process.env.NUXT_PUBLIC_API_BASE,
-      geoApiBase: ''
+      apiBase: process.env.NUXT_PUBLIC_API_BASE
    }
  },
  toast: {
--- a/frontend/pages/admin/bovin/[[id]].vue
+++ b/frontend/pages/admin/bovin/[[id]].vue
@@ -1,33 +1,24 @@
 <template>
-    <form :class="{ submitted }" @submit.prevent="validate">
-        <div class="flex items-center justify-between relative">
-            <div class="flex flex-row absolute -left-[60px]">
-                <Icon
-                    @click="router.push('/admin/bovin/bovin-list')"
-                    name="gg:arrow-left-o"
-                    size="40"
-                    class="cursor-pointer text-primary-500"
-                />
-            </div>
-            <h1 class="text-3xl text-primary-500 font-bold uppercase">
-                {{ route.params.id ? 'Modifications du type bovin' : 'Ajout d\'un type bovin' }}
+    <form @submit.prevent="validate">
+        <div class="text-primary-500 flex items-center justify-between">
+            <h1 class="text-3xl font-bold uppercase">
+                {{ route.params.id ? 'Modifier bovin' : 'Ajout bovin' }}
            </h1>
-        </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" 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"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] hover:opacity-80"
            >
-                Valider
+                <Icon name="mdi:check" size="28" />
+                {{ isEdit ? 'Modifier' : 'Ajouter' }}
            </UiButton>
        </div>
+
+        <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 py-12">
+            <UiTextInput label="Nom du bovin" id="bovin-label" v-model="form.label" />
+            <UiTextInput label="Code bovin" id="code-id" v-model="form.code" />
+        </div>
    </form>
 </template>

@@ -38,9 +29,6 @@ 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)

 function resolveId(param: unknown) {
    const idStr = Array.isArray(param) ? param[0] : param
@@ -49,6 +37,9 @@ function resolveId(param: unknown) {
    return Number.isFinite(id) ? id : null
 }

+const idBovin = computed(() => resolveId(route.params.id))
+const isEdit = computed(() => idBovin.value !== null)
+
 const form = reactive<BovinFormData>({
    label: '',
    code: ''
@@ -101,6 +92,7 @@ async function validate() {
        } else {
            await createBovin(basePayload)
        }
+        await navigate()
    } finally {
        isLoading.value = false
    }
--- a/frontend/pages/admin/bovin/bovin-list.vue
+++ b/frontend/pages/admin/bovin/bovin-list.vue
@@ -1,67 +0,0 @@
-<template>
-    <div class="flex items-center justify-between ">
-        <h1 class="text-4xl font-bold uppercase text-primary-500">Liste des types bovins</h1>
-    </div>
-    <div class="mt-7 border border-slate-200 mb-11 ">
-        <div class="grid grid-cols-2 gap-4 text-primary-700 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
-            <div>Nom</div>
-            <div>Code</div>
-        </div>
-        <div v-if="!auth.isAdmin" class="px-4 py-6 text-slate-400">
-            Accès réservé aux administrateurs.
-        </div>
-        <div v-else-if="bovinList.length === 0" class="px-4 py-6 text-slate-400">
-            Aucun type de bovin.
-        </div>
-        <template v-else>
-            <div
-                v-for="bovin in bovinList"
-                :key="bovin.id"
-                class="grid grid-cols-2 text-primary-700 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
-                role="button"
-                tabindex="0"
-                @click="goToBovin(bovin.id)"
-                @keydown.enter="goToBovin(bovin.id)"
-            >
-                <div>{{ bovin.label }}</div>
-                <div>{{ bovin.code }}</div>
-            </div>
-        </template>
-    </div>
-    <div class="flex justify-center items-center">
-        <NuxtLink
-            to="/admin/bovin"
-            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
-            :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
-            @click="handleAddClick"
-        >
-            <Icon name="mdi:plus" size="28"  />
-            Ajouter
-        </NuxtLink>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { getBovineTypeList } from "~/services/bovine-type"
-import type { BovineTypeData } from "~/services/dto/bovine-type-data"
-import { useAuthStore } from "~/stores/auth"
-
-const bovinList = ref<BovineTypeData[]>([])
-const router = useRouter()
-const auth = useAuthStore()
-
-const goToBovin = (id: number) => {
-    if (!auth.isAdmin) return
-    router.push(`/admin/bovin/${id}`)
-}
-
-const handleAddClick = (event: Event) => {
-    if (auth.isAdmin) return
-    event.preventDefault()
-}
-
-onMounted(async () => {
-    if (!auth.isAdmin) return
-    bovinList.value = await getBovineTypeList()
-})
-</script>
--- a/frontend/pages/admin/bovin/list.vue
+++ b/frontend/pages/admin/bovin/list.vue
@@ -0,0 +1,72 @@
+<template>
+    <div class="flex items-center justify-between">
+        <h1 class="text-3xl font-bold text-primary-500 uppercase">Liste des types bovins</h1>
+        <NuxtLink
+            to="/admin/bovin"
+            class="inline-flex items-center justify-center
+                   text-xl text-white uppercase
+                   bg-primary-500 h-[50px] px-8 rounded
+                   hover:opacity-80 gap-2"
+            @click="handleAddClick"
+        >
+            <Icon name="mdi:plus" size="28"  />
+            Ajouter
+        </NuxtLink>
+    </div>
+    <div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
+        <div class="max-h-96 overflow-y-auto">
+            <div
+                class="sticky
+                       grid grid-cols-2 gap-4
+                       bg-slate-100 px-4 py-3
+                       font-semibold uppercase
+                       tracking-wide"
+            >
+                <div class="col-span-1">Nom</div>
+                <div class="col-span-1">Code</div>
+            </div>
+            <div v-if="bovinList.length === 0" class="px-4 py-6 text-slate-400">
+                Aucun type de bovin.
+            </div>
+            <div v-else>
+                <div
+                    v-for="bovin in bovinList"
+                    :key="bovin.id"
+                    class="grid grid-cols-2 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
+                    @click="goToBovin(bovin.id)"
+                >
+                    <div class="col-span-1">{{ bovin.label }}</div>
+                    <div class="col-span-1">{{ bovin.code }}</div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
+        Accès réservé aux administrateurs.
+    </div>
+</template>
+
+<script setup lang="ts">
+import { getBovineTypeList } from "~/services/bovine-type"
+import type { BovineTypeData } from "~/services/dto/bovine-type-data"
+import { useAuthStore } from "~/stores/auth"
+
+const bovinList = ref<BovineTypeData[]>([])
+const router = useRouter()
+const auth = useAuthStore()
+
+const goToBovin = (id: number) => {
+    if (!auth.isAdmin) return
+    router.push(`/admin/bovin/${id}`)
+}
+
+const handleAddClick = (event: Event) => {
+    if (auth.isAdmin) return
+    event.preventDefault()
+}
+
+onMounted(async () => {
+    if (!auth.isAdmin) return
+    bovinList.value = await getBovineTypeList()
+})
+</script>
--- a/frontend/pages/admin/carrier/[[id]].vue
+++ b/frontend/pages/admin/carrier/[[id]].vue
@@ -1,44 +1,31 @@

 <template>
-    <form :class="{ submitted }" @submit.prevent="validate">
-        <div class="flex items-center justify-between relative">
-            <div class="flex flex-row absolute -left-[60px]">
-                <Icon
-                    @click="router.push('/admin/carrier/carrier-list')"
-                    name="gg:arrow-left-o"
-                    size="40"
-                    class="cursor-pointer text-primary-500"
-                />
-            </div>
-            <h1 class="text-3xl text-primary-500 font-bold uppercase">
-                {{ route.params.id ? 'Modification du transporteur' : 'Ajout d\'un transporteur' }}
-            </h1>
-        </div>
+    <form @submit.prevent="validate">
+    <div class="flex items-center justify-between">
+        <h1 class="text-3xl font-bold uppercase">
+            {{ route.params.id ? 'Modifier transporteur' : 'Ajout transporteur' }}
+        </h1>

-        <div class="grid grid-cols-2 items-start pt-7 mb-11 gap-x-[200px]">
-            <UiTextInput
-                label="Nom du transporteur"
-                id="carrier-name"
-                v-model="form.name"
-                required
-            />
+        <UiButton
+            type="submit"
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
+        >Enregistrer
+        </UiButton>
+    </div>

-            <UiTextInput
-                label="Code transporteur"
+    <div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 py-12">
+        <UiTextInput
+            label = "nom du fournisseur"
+            id="carrier-name"
+            v-model="form.name"
+        />
+
+        <UiTextInput
+                label = "code fournisseur"
                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>
-        </div>
+        />
+    </div>
    </form>

 </template>
@@ -52,7 +39,6 @@ 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
@@ -66,6 +52,10 @@ const form = reactive<CarrierFormData>({
    name:''
 })

+definePageMeta({
+    layout: 'default'
+})
+
 const hydrateFromUser = (carrier: CarrierData | null) => {
    if (!carrier) {
        return
@@ -105,10 +95,11 @@ async function validate() {

    if(idCarrier.value){
        await updateCarrier(idCarrier.value, basePayload)
+        navigate()
        return
-    }else{
-        await createCarrier(basePayload)
    }
+    await createCarrier(basePayload)
+    navigate()
 }

 function navigate(){
--- a/frontend/pages/admin/carrier/carrier-list.vue
+++ b/frontend/pages/admin/carrier/carrier-list.vue
@@ -1,51 +1,43 @@
 <template>
-
    <div class="flex items-center justify-between ">
-            <h1 class="text-4xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
-    </div>
-
-        <div class="mt-7 border border-slate-200 mb-11 ">
-            <div class="grid grid-cols-2 gap-4 text-primary-700 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
-                <div>Label</div>
-                <div>Code</div>
-            </div>
-            <div
-                v-for="carrier in carrierList"
-                :key="carrier.id"
-                class="grid grid-cols-2 text-primary-700 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
-                role="button"
-                tabindex="0"
-                @click="goToCarrier(carrier.id)"
-                @keydown.enter="goToCarrier(carrier.id)"
-            >
-                <div>{{ carrier.name}}</div>
-                <div>{{ carrier.code }}</div>
-            </div>
-        </div>
-    <div class="flex justify-center items-center">
+        <h1 class="text-3xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
        <NuxtLink
            to="/admin/carrier"
-            class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
        >
-            <Icon name="mdi:plus" size="28"  />
+            <Icon name="mdi:plus" size="28"/>
            Ajouter
        </NuxtLink>
    </div>

+    <UiDataTable
+        :columns="columns"
+        url="carriers"
+        @row-click="onCarrierRowClick"
+    />
 </template>

 <script setup lang="ts">
-import type {CarrierData} from "~/services/dto/carrier-data";
-import {getCarrierList} from "~/services/carrier";
+import type {ColumnConfig, Row} from "~/services/dto/datatable-data";

-const carrierList = ref<CarrierData[]>()
 const router = useRouter()

+const columns: ColumnConfig[] = [
+    {key: "name", label: "Label"},
+    {key: "code", label: "Code"},
+]
+
 const goToCarrier = (id: number) => {
    router.push(`/admin/carrier/${id}`)
 }

-onMounted(async () => {
-    carrierList.value = await getCarrierList(false)
+const onCarrierRowClick = (row: Row) => {
+    const id = Number(row.id)
+    if (!Number.isFinite(id)) return
+        goToCarrier(id)
+}
+
+definePageMeta({
+    layout: 'default'
 })
 </script>
--- a/frontend/pages/admin/customer/[[id]].vue
+++ b/frontend/pages/admin/customer/[[id]].vue
@@ -1,97 +1,46 @@
 <template>
-    <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"/>
-            </div>
-            <h1 class="text-3xl text-primary-500  font-bold uppercase">
-                {{ customerId ? "Modification du client" : "Ajout d'un client" }}
+    <form @submit.prevent="validate">
+        <div class="flex items-center justify-between">
+            <h1 class="text-3xl font-bold uppercase">
+                {{ customerId ? "Modifications du client" : "Ajout d'un client" }}
            </h1>
-        </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]" 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 v-if="!customerId" class="flex flex-cols-3 justify-between mb-11">
-            <UiTextInput id="address-street" v-model="addressForm.street" label="Rue" wrapper-class="w-[280px]" required />
-            <UiTextInput id="address-street2" v-model="addressForm.street2" label="Complément" wrapper-class="w-[280px]" />
-            <UiTextInput id="address-country" v-model="addressForm.countryCode" label="Pays (code)" wrapper-class="w-[280px]" />
-        </div>
-        <div v-if="!customerId" class="flex flex-cols-3 justify-between mb-11">
-            <UiTextInput id="address-postalCode" v-model="addressForm.postalCode" label="Code postal" wrapper-class="w-[280px]" required />
-            <UiSelect id="address-city" v-model="addressForm.city" label="Ville"
-                      :options="communeOptions" :loading="isLoadingCities"
-                      wrapper-class="w-[280px]" required />
-            <div 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"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                type="submit"
                :disabled="isLoading || !auth.isAdmin"
-                @click="submitted = true"
            >
-                <Icon :name="customerId ? '' : 'mdi:plus'" size="28" />
-                {{ customerId ? "Valider" : "Ajouter" }}
+                {{ customerId ? "Sauvegarder" : "Ajouter" }}
            </UiButton>
        </div>

-        <template v-if="customerId">
-        <div class="flex items-center justify-between mb-7">
-            <h2 class="text-3xl text-primary-500 font-bold uppercase">Adresses du client</h2>
+        <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
+            <UiTextInput id="customer-name" v-model="form.name" label="Nom du client" :disabled="!auth.isAdmin"/>
+            <UiTextInput id="customer-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin"/>
+            <UiTextInput id="customer-email" v-model="form.email" label="Email" :disabled="!auth.isAdmin"/>
        </div>
-        <div class="overflow-x-auto mb-11 text-primary-700">
-            <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">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>
-                    <th class="py-3 px-4 text-sm uppercase">Ville</th>
-                    <th class="py-3 px-4 text-sm uppercase">Pays</th>
-                </tr>
-                </thead>
-                <tbody>
-                <template v-if="form.addresses.length === 0">
-                    <tr>
-                        <td colspan="5" class="py-4 text-slate-400">
-                            Aucune adresse.
-                        </td>
-                    </tr>
-                </template>
-                <template v-else>
-                    <tr
-                        v-for="(address, index) in form.addresses"
-                        :key="address.id ?? index"
-                        class="border border-gray-100 hover:bg-slate-50"
-                        :class="auth.isAdmin ? 'cursor-pointer' : 'cursor-not-allowed opacity-60'"
-                        @click="goToEditAddress(address.id ?? null)"
-                    >
-                        <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>
-                        <td class="py-3 px-4">{{ address.city || "—" }}</td>
-                        <td class="py-3 px-4">{{ address.countryCode || "—" }}</td>
-                    </tr>
-                </template>
-                </tbody>
-            </table>
-        </div>
-        <div class="flex justify-center items-center">
+
+        <div class="mx-24 mb-4 py-6 border-t border-black"></div>
+        <div class="flex items-center justify-between mb-4">
+            <h2 class="text-3xl font-bold uppercase">Adresses client</h2>
            <UiButton
                type="button"
-                class="inline-flex items-center justify-center text-xl gap-2 text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                :disabled="customerId === null || !auth.isAdmin"
                @click="goToAddAddress"
            >
-                <Icon name="mdi:plus" size="28" />
                Ajouter
            </UiButton>
        </div>
-        </template>
+        <UiDataTable
+            class="mb-10"
+            :columns="addressColumns"
+            :url="customerId !== null ? `customers/${customerId}` : ''"
+            response-path="addresses"
+            :items-per-page="5"
+            :row-clickable="auth.isAdmin"
+            @row-click="onAddressRowClick"
+        />
    </form>
 </template>

@@ -99,10 +48,11 @@
 import {computed, reactive, ref, watch} from "vue"
 import {createCustomer, getCustomer, updateCustomer} from "~/services/customer"
 import type {CustomerData, CustomerFormData, CustomerPayload} from "~/services/dto/customer-data"
-import {createAddress, type AddressPayload} from "~/services/address"
-import {getCommunesByPostalCode, type CommuneData} from "~/services/geo"
+import type {ColumnConfig, Row} from "~/services/dto/datatable-data"
 import {useAuthStore} from "~/stores/auth"

+definePageMeta({layout: "default"})
+
 const route = useRoute()
 const router = useRouter()
 const auth = useAuthStore()
@@ -115,37 +65,20 @@ 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: "",
    email: "",
    addresses: [],
 })
-
-// Address form (creation mode only)
-const addressForm = reactive<AddressPayload>({
-    street: "", street2: null, postalCode: "", city: "", countryCode: "FR",
-})
-const communes = ref<CommuneData[]>([])
-const isLoadingCities = ref(false)
-const communeOptions = computed(() => communes.value.map(c => ({ value: c.nom, label: c.nom })))
-
-let debounceTimer: ReturnType<typeof setTimeout> | null = null
-watch(() => addressForm.postalCode, (cp) => {
-    if (debounceTimer) clearTimeout(debounceTimer)
-    if (!cp || cp.length < 5) { communes.value = []; addressForm.city = ''; return }
-    if (cp.length === 5) {
-        debounceTimer = setTimeout(async () => {
-            isLoadingCities.value = true
-            try {
-                communes.value = await getCommunesByPostalCode(cp)
-                if (communes.value.length === 1) addressForm.city = communes.value[0].nom
-                else addressForm.city = ''
-            } finally { isLoadingCities.value = false }
-        }, 300)
-    }
-})
+const addressColumns: ColumnConfig[] = [
+    {key: "label", label: "Libellé"},
+    {key: "street", label: "Rue"},
+    {key: "street2", label: "Complément"},
+    {key: "postalCode", label: "Code postal"},
+    {key: "city", label: "Ville"},
+    {key: "countryCode", label: "Pays"},
+]

 const goToAddAddress = () => {
    if (customerId.value === null || !auth.isAdmin) return
@@ -168,28 +101,16 @@ const goToEditAddress = (addressId: number | null) => {
    })
 }

+const onAddressRowClick = (row: Row) => {
+    const id = Number(row.id)
+    goToEditAddress(Number.isFinite(id) ? id : null)
+}
+
 const hydrateFromCustomer = (customer: CustomerData | null) => {
    if (!customer) return
    form.name = customer.name ?? ""
    form.phone = customer.phone ?? ""
    form.email = customer.email ?? ""
-    if (!Array.isArray(customer.addresses) || customer.addresses.length === 0) {
-        form.addresses = []
-        return
-    }
-    if (typeof customer.addresses[0] === "string") {
-        form.addresses = []
-        return
-    }
-
-    form.addresses = customer.addresses.map((address) => ({
-        id: address.id ?? null,
-        street: address.street ?? "",
-        street2: address.street2 ?? null,
-        postalCode: address.postalCode ?? "",
-        city: address.city ?? "",
-        countryCode: address.countryCode ?? "",
-    }))
 }

 watch(
@@ -228,14 +149,7 @@ async function validate() {
            await updateCustomer(customerId.value, customerPayload)
            targetId = customerId.value
        } else {
-            const addressData = await createAddress({ ...addressForm })
-            const addressIRI = `/api/addresses/${addressData.id}`
-            const creationPayload = {
-                ...customerPayload,
-                addresses: [addressIRI],
-                ...(auth.user?.id ? { createdBy: `/api/users/${auth.user.id}` } : {}),
-            }
-            const created = await createCustomer(creationPayload)
+            const created = await createCustomer(customerPayload)
            targetId = created.id
        }

--- a/frontend/pages/admin/customer/address.vue
+++ b/frontend/pages/admin/customer/address.vue
@@ -8,6 +8,8 @@ import { createAddress, getAddress, updateAddress } from "~/services/address"
 import { getCustomer, updateCustomer } from "~/services/customer"
 import type { CustomerData } from "~/services/dto/customer-data"

+definePageMeta({ layout: "default" })
+
 const route = useRoute()
 const router = useRouter()
 const customerId = computed(() => Number(route.query.customerId))
@@ -16,10 +18,13 @@ const addressId = computed(() => (route.query.addressId !== undefined ? Number(r
 const address = ref<AddressData | null>(null)

 const validate = async (payload: AddressPayload) => {
-    if (addressId.value !== null) {
-        await updateAddress(addressId.value, payload)
-    } else {
-        await addAddress(payload)
+    try {
+        if (addressId.value !== null) {
+            await updateAddress(addressId.value, payload)
+        } else {
+            await addAddress(payload)
+        }
+    } finally {
        await router.push("/admin/customer/" + customerId.value)
    }
 }
--- a/frontend/pages/admin/customer/customer-list.vue
+++ b/frontend/pages/admin/customer/customer-list.vue
@@ -1,73 +1,59 @@
 <template>
    <div class="flex items-center justify-between">
-        <h1 class="text-4xl font-bold uppercase text-primary-500">Liste des clients</h1>
-    </div>
-
-    <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-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>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"
-                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>
-    <div v-else class="mt-7 border border-slate-200 mb-11 px-4 py-6 text-slate-400">
-        Accès réservé aux administrateurs.
-    </div>
-    <div class="flex justify-center items-center">
+        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des Clients</h1>
        <NuxtLink
            to="/admin/customer"
-            class="inline-flex items-center mb-16 justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
            :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
            @click="handleAddClick"
        >
-            <Icon name="mdi:plus" size="28" />
+            <Icon name="mdi:plus" size="28"  />
            Ajouter
        </NuxtLink>
    </div>
+
+    <UiDataTable
+        v-if="auth.isAdmin"
+        :columns="columns"
+        url="customers"
+        @row-click="onCustomerRowClick"
+    />
+    <div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
+        Accès réservé aux administrateurs.
+    </div>
 </template>

 <script setup lang="ts">
-import { getCustomerList } from "~/services/customer"
-import type { CustomerData } from "~/services/dto/customer-data"
+import type { ColumnConfig, Row } from "~/services/dto/datatable-data"
+import { formatAddresses } from "~/utils/datatable-formatters"
 import { useAuthStore } from "~/stores/auth"

-const customerList = ref<CustomerData[]>([])
+definePageMeta({ layout: "default" })
+
 const router = useRouter()
 const auth = useAuthStore()

+const columns: ColumnConfig[] = [
+    { key: "name", label: "Nom", isSearchable:true},
+    { key: "phone", label: "Téléphone" },
+    { key: "email", label: "Email" },
+    { key: "addresses", label: "Adresses", format: formatAddresses  },
+]
+
 const goToCustomer = (id: number) => {
    if (!auth.isAdmin) return
    router.push(`/admin/customer/${id}`)
 }

+const onCustomerRowClick = (row: Row) => {
+    const id = Number(row.id)
+    if (!Number.isFinite(id)) return
+    goToCustomer(id)
+}
+
 const handleAddClick = (event: Event) => {
    if (auth.isAdmin) return
    event.preventDefault()
 }

-onMounted(async () => {
-    if (!auth.isAdmin) return
-    customerList.value = await getCustomerList()
-})
 </script>
--- a/frontend/pages/admin/dashboard.vue
+++ b/frontend/pages/admin/dashboard.vue
@@ -0,0 +1,7 @@
+<template>
+</template>
+<script setup lang="ts">
+definePageMeta({
+    layout: 'default'
+})
+</script>
--- a/frontend/pages/admin/supplier/[[id]].vue
+++ b/frontend/pages/admin/supplier/[[id]].vue
@@ -1,98 +1,46 @@
 <template>
-    <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/supplier/supplier-list')" name="gg:arrow-left-o" size="40" class="cursor-pointer text-primary-500"/>
-            </div>
-            <h1 class="text-3xl text-primary-500  font-bold uppercase">
-                {{ supplierId ? "Modification du fournisseur" : "Ajout d'un fournisseur" }}
+    <form @submit.prevent="validate">
+        <div class="flex items-center justify-between">
+            <h1 class="text-3xl font-bold uppercase">
+                {{ supplierId ? "Modifications du fournisseur" : "Ajout d'un fournisseur" }}
            </h1>
-        </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]" 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]"/>
-        </div>
-        <div v-if="!supplierId" class="flex flex-cols-3 justify-between mb-11">
-            <UiTextInput id="address-street" v-model="addressForm.street" label="Rue" wrapper-class="w-[280px]" required />
-            <UiTextInput id="address-street2" v-model="addressForm.street2" label="Complément" wrapper-class="w-[280px]" />
-            <UiTextInput id="address-country" v-model="addressForm.countryCode" label="Pays (code)" wrapper-class="w-[280px]" />
-        </div>
-        <div v-if="!supplierId" class="flex flex-cols-3 justify-between mb-11">
-            <UiTextInput id="address-postalCode" v-model="addressForm.postalCode" label="Code postal" wrapper-class="w-[280px]" required />
-            <UiSelect id="address-city" v-model="addressForm.city" label="Ville"
-                      :options="communeOptions" :loading="isLoadingCities"
-                      wrapper-class="w-[280px]" required />
-            <div 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"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
                type="submit"
                :disabled="isLoading || !auth.isAdmin"
-                @click="submitted = true"
            >
-                <Icon :name="supplierId ? '' : 'mdi:plus'" size="28" />
-                {{ supplierId ? "Valider" : "Ajouter" }}
+                {{ supplierId ? "Sauvegarder" : "Ajouter" }}
            </UiButton>
        </div>

-        <template v-if="supplierId">
-        <div class="flex items-center justify-between mb-7">
-            <h2 class="text-3xl text-primary-500 font-bold uppercase">Adresses du fournisseur</h2>
+        <div class="grid grid-cols-2 gap-y-8 gap-x-80 mb-10 py-12">
+            <UiTextInput id="supplier-name" v-model="form.name" label="Nom du fournisseur" :disabled="!auth.isAdmin"/>
+            <UiTextInput id="supplier-email" v-model="form.email" label="Email" :disabled="!auth.isAdmin"/>
+            <UiTextInput id="supplier-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin"/>
        </div>
-        <div class="overflow-x-auto mb-11 text-primary-700">
-            <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">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>
-                    <th class="py-3 px-4 text-sm uppercase">Ville</th>
-                    <th class="py-3 px-4 text-sm uppercase">Pays</th>
-                </tr>
-                </thead>
-                <tbody>
-                <template v-if="form.addresses.length === 0">
-                    <tr>
-                        <td colspan="5" class="py-4 text-slate-400">
-                            Aucune adresse.
-                        </td>
-                    </tr>
-                </template>
-                <template v-else>
-                    <tr
-                        v-for="(address, index) in form.addresses"
-                        :key="address.id ?? index"
-                        class="border border-gray-100 hover:bg-slate-50"
-                        :class="auth.isAdmin ? 'cursor-pointer' : 'cursor-not-allowed opacity-60'"
-                        @click="goToEditAddress(address.id ?? null)"
-                    >
-                        <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>
-                        <td class="py-3 px-4">{{ address.city || "—" }}</td>
-                        <td class="py-3 px-4">{{ address.countryCode || "—" }}</td>
-                    </tr>
-                </template>
-                </tbody>
-            </table>
+
+        <div class="mx-24 mb-4 py-6 border-t border-black"></div>
+        <div class="flex items-center justify-between mb-4">
+            <h2 class="text-3xl font-bold uppercase">Adresses fournisseur</h2>
+            <UiButton
+                type="button"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                :disabled="supplierId === null || !auth.isAdmin"
+                @click="goToAddAddress"
+            >
+                Ajouter
+            </UiButton>
        </div>
-        <div class="flex justify-center items-center">
-        <UiButton
-            type="button"
-            class="inline-flex items-center justify-center text-xl gap-2 text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
-            :disabled="supplierId === null || !auth.isAdmin"
-            @click="goToAddAddress"
-        >
-            <Icon name="mdi:plus" size="28" />
-            Ajouter
-        </UiButton>
-        </div>
-        </template>
+        <UiDataTable
+            class="mb-10"
+            :columns="addressColumns"
+            :url="supplierId !== null ? `suppliers/${supplierId}` : ''"
+            response-path="addresses"
+            :items-per-page="5"
+            :row-clickable="auth.isAdmin"
+            @row-click="onAddressRowClick"
+        />
    </form>
 </template>

@@ -100,10 +48,11 @@
 import {computed, reactive, ref, watch} from "vue"
 import {createSupplier, getSupplier, updateSupplier} from "~/services/supplier"
 import type {SupplierData, SupplierFormData, SupplierPayload} from "~/services/dto/supplier-data"
-import {createAddress, type AddressPayload} from "~/services/address"
-import {getCommunesByPostalCode, type CommuneData} from "~/services/geo"
+import type {ColumnConfig, Row} from "~/services/dto/datatable-data"
 import {useAuthStore} from "~/stores/auth"

+definePageMeta({layout: "default"})
+
 const route = useRoute()
 const router = useRouter()
 const auth = useAuthStore()
@@ -116,37 +65,20 @@ 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: "",
    phone: "",
    addresses: [],
 })
-
-// Address form (creation mode only)
-const addressForm = reactive<AddressPayload>({
-    street: "", street2: null, postalCode: "", city: "", countryCode: "FR",
-})
-const communes = ref<CommuneData[]>([])
-const isLoadingCities = ref(false)
-const communeOptions = computed(() => communes.value.map(c => ({ value: c.nom, label: c.nom })))
-
-let debounceTimer: ReturnType<typeof setTimeout> | null = null
-watch(() => addressForm.postalCode, (cp) => {
-    if (debounceTimer) clearTimeout(debounceTimer)
-    if (!cp || cp.length < 5) { communes.value = []; addressForm.city = ''; return }
-    if (cp.length === 5) {
-        debounceTimer = setTimeout(async () => {
-            isLoadingCities.value = true
-            try {
-                communes.value = await getCommunesByPostalCode(cp)
-                if (communes.value.length === 1) addressForm.city = communes.value[0].nom
-                else addressForm.city = ''
-            } finally { isLoadingCities.value = false }
-        }, 300)
-    }
-})
+const addressColumns: ColumnConfig[] = [
+    {key: "label", label: "Libellé"},
+    {key: "street", label: "Rue"},
+    {key: "street2", label: "Complément"},
+    {key: "postalCode", label: "Code postal"},
+    {key: "city", label: "Ville"},
+    {key: "countryCode", label: "Pays"},
+]

 const goToAddAddress = () => {
    if (supplierId.value === null || !auth.isAdmin) return
@@ -171,28 +103,16 @@ const goToEditAddress = (addressId: number | null) => {
    })
 }

+const onAddressRowClick = (row: Row) => {
+    const id = Number(row.id)
+    goToEditAddress(Number.isFinite(id) ? id : null)
+}
+
 const hydrateFromSupplier = (supplier: SupplierData | null) => {
    if (!supplier) return
    form.name = supplier.name ?? ""
    form.email = supplier.email ?? ""
    form.phone = supplier.phone ?? ""
-    if (!Array.isArray(supplier.addresses) || supplier.addresses.length === 0) {
-        form.addresses = []
-        return
-    }
-    if (typeof supplier.addresses[0] === "string") {
-        form.addresses = []
-        return
-    }
-
-    form.addresses = supplier.addresses.map((address) => ({
-        id: address.id ?? null,
-        street: address.street ?? "",
-        street2: address.street2 ?? null,
-        postalCode: address.postalCode ?? "",
-        city: address.city ?? "",
-        countryCode: address.countryCode ?? "",
-    }))
 }

 watch(
@@ -231,14 +151,7 @@ async function validate() {
            await updateSupplier(supplierId.value, supplierPayload)
            targetId = supplierId.value
        } else {
-            const addressData = await createAddress({ ...addressForm })
-            const addressIRI = `/api/addresses/${addressData.id}`
-            const creationPayload = {
-                ...supplierPayload,
-                addresses: [addressIRI],
-                ...(auth.user?.id ? { createdBy: `/api/users/${auth.user.id}` } : {}),
-            }
-            const created = await createSupplier(creationPayload)
+            const created = await createSupplier(supplierPayload)
            targetId = created.id
        }

--- a/frontend/pages/admin/supplier/address.vue
+++ b/frontend/pages/admin/supplier/address.vue
@@ -8,6 +8,8 @@ import {createAddress, getAddress, updateAddress} from "~/services/address";
 import {getSupplier, updateSupplier} from "~/services/supplier";
 import type {SupplierData} from "~/services/dto/supplier-data";

+definePageMeta({ layout: "default" })
+
 const route = useRoute()
 const router = useRouter()
 const supplierId = computed(() => { return Number(route.query.supplierId) })
@@ -16,12 +18,15 @@ const addressId = computed(() => { return route.query.addressId !== undefined ?
 const address = ref<AddressData|null>(null)

 const validate = async (address: AddressPayload) => {
+    try {
        if (addressId.value !== null) {
            await updateAddress(addressId.value, address)
        } else {
            await addAddress(address)
-            await router.push('/admin/supplier/' + supplierId.value)
        }
+    } finally {
+        await router.push('/admin/supplier/' + supplierId.value)
+    }
 }

 const addAddress = async (address: AddressPayload) => {
--- a/frontend/pages/admin/supplier/supplier-list.vue
+++ b/frontend/pages/admin/supplier/supplier-list.vue
@@ -1,73 +1,58 @@
 <template>
    <div class="flex items-center justify-between">
-        <h1 class="text-4xl font-bold uppercase text-primary-500">Liste des fournisseurs</h1>
-    </div>
-
-    <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-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>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"
-                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>
-    <div v-else class="mt-7 border border-slate-200 mb-11 px-4 py-6 text-slate-400">
-        Accès réservé aux administrateurs.
-    </div>
-    <div class="flex justify-center items-center">
+        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des fournisseurs</h1>
        <NuxtLink
            to="/admin/supplier"
-            class="inline-flex items-center mb-16 justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
            :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
            @click="handleAddClick"
        >
-            <Icon name="mdi:plus" size="28" />
+            <Icon name="mdi:plus" size="28"  />
            Ajouter
        </NuxtLink>
    </div>
+
+    <UiDataTable
+        v-if="auth.isAdmin"
+        :columns="columns"
+        url="suppliers"
+        @row-click="onSupplierRowClick"
+    />
+    <div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
+        Accès réservé aux administrateurs.
+    </div>
 </template>

 <script setup lang="ts">
-import { getSupplierList } from "~/services/supplier"
-import type { SupplierData } from "~/services/dto/supplier-data"
+import type { ColumnConfig, Row } from "~/services/dto/datatable-data"
+import {formatAddresses} from "~/utils/datatable-formatters"
 import { useAuthStore } from "~/stores/auth"

-const supplierList = ref<SupplierData[]>([])
+definePageMeta({ layout: "default" })
+
 const router = useRouter()
 const auth = useAuthStore()

+const columns: ColumnConfig[] = [
+    { key: "name", label: "Nom", isSearchable:true },
+    { key: "email", label: "Mail" },
+    { key: "addresses", label: "Adresses",  format: formatAddresses },
+]
+
 const goToSupplier = (id: number) => {
    if (!auth.isAdmin) return
    router.push(`/admin/supplier/${id}`)
 }

+const onSupplierRowClick = (row: Row) => {
+    const id = Number(row.id)
+    if (!Number.isFinite(id)) return
+    goToSupplier(id)
+}
+
 const handleAddClick = (event: Event) => {
    if (auth.isAdmin) return
    event.preventDefault()
 }

-onMounted(async () => {
-    if (!auth.isAdmin) return
-    supplierList.value = await getSupplierList()
-})
 </script>
--- a/frontend/pages/admin/user/[[id]].vue
+++ b/frontend/pages/admin/user/[[id]].vue
@@ -1,78 +1,57 @@
 <template>
-    <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/user/list')"
-                    name="gg:arrow-left-o"
-                    size="40"
-                    class="cursor-pointer text-primary-500"
-                />
-            </div>
-            <h1 class="text-3xl text-primary-500 font-bold uppercase">
-                {{ userId ? "Modification de l'utilisateur" : "Ajout d'un utilisateur" }}
+    <form @submit.prevent="validate">
+        <div
+            class="flex items-center justify-between gap-10">
+            <h1 class="text-3xl font-bold uppercase">
+                {{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
            </h1>
+            <UiButton
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                type="submit"
+            >
+                {{ userId ? 'Sauvegarder' : 'Ajouter' }}
+            </UiButton>
        </div>

-        <div class="flex flex-cols-3 justify-between mb-11 pt-7">
+        <div class="grid gap-y-16 gap-x-40 py-12">
            <UiTextInput
                id="user-name"
                v-model="form.username"
                label="Nom de l'utilisateur"
-                :disabled="!auth.isAdmin"
-                wrapper-class="w-[280px]"
-                required
            />

            <UiSelect
                id="user-role"
                v-model="form.role"
-                label="Role de l'utilisateur"
+                label="Rôle de l'utilisateur"
                :options="ROLE"
-                :disabled="!auth.isAdmin"
-                wrapper-class="w-[280px]"
-                required
            />
-
            <UiTextInput
                id="user-password"
                v-model="form.password"
                label="Mot de passe"
                type="password"
-                :disabled="!auth.isAdmin"
-                wrapper-class="w-[280px]"
-                required
-            />
-        </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 || isHydrating || !auth.isAdmin"
-                @click="submitted = true"
-            >
-                <Icon :name="userId ? '' : 'mdi:plus'" size="28" />
-                {{ userId ? 'Valider' : 'Ajouter' }}
-            </UiButton>
+            />
+
        </div>
    </form>
 </template>
-
 <script setup lang="ts">
-import { computed, reactive, ref, watch } from 'vue'
-import { ROLE } from '~/utils/constants'
-import { createUser, updateUser, getUser } from '~/services/auth'
-import type { UserData, UserFormData, UserPayload } from '~/services/dto/user-data'
-import { useAuthStore } from '~/stores/auth'
+definePageMeta({
+    layout: 'default'
+})
+
+import {computed, reactive, ref, watch} from 'vue'
+import {ROLE} from '~/utils/constants'
+import {createUser, updateUser, getUser} from '~/services/auth'
+import type {UserData, UserFormData, UserPayload} from '~/services/dto/user-data'

 const route = useRoute()
 const router = useRouter()
-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
@@ -83,6 +62,7 @@ const resolveUserId = (param: unknown) => {
    return Number.isFinite(id) ? id : null
 }

+
 const form = reactive<UserFormData>({
    username: '',
    password: '',
@@ -96,8 +76,8 @@ const hydrateFromUser = (user: UserData | null) => {
    isHydrating.value = true
    form.username = user.username ?? ''
    const roles = user.roles ?? []
-    const hasAdmin = roles.includes('ROLE_ADMIN')
-    form.role = hasAdmin ? 'ROLE_ADMIN' : 'ROLE_USER'
+    const hasAdmin = roles.includes("ROLE_ADMIN")
+    form.role = hasAdmin ? "ROLE_ADMIN" : "ROLE_USER"
    form.password = ''
    isHydrating.value = false
 }
@@ -116,11 +96,10 @@ watch(
            isLoading.value = false
        }
    },
-    { immediate: true }
+    {immediate: true}
 )

 async function validate() {
-    if (!auth.isAdmin) return

    const normalizedUsername = form.username.trim()
    const normalizedRole = form.role.trim()
@@ -136,12 +115,13 @@ async function validate() {

    if (userId.value) {
        await updateUser(userId.value, basePayload)
+        await router.push(`/admin/user/list/`)
        return
    }

    const created = await createUser(basePayload)
    if (created) {
-        await router.push('/admin/user/list')
+        await router.push(`/admin/user/list/`)
    }
 }
 </script>
--- a/frontend/pages/admin/user/list.vue
+++ b/frontend/pages/admin/user/list.vue
@@ -1,81 +1,44 @@
 <template>
    <div class="flex items-center justify-between">
-        <h1 class="text-4xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
-    </div>
-
-    <div v-if="auth.isAdmin" class="mt-7 border border-slate-200 mb-11">
-        <div class="grid grid-cols-2 text-primary-700 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
-            <div>Utilisateur</div>
-            <div>Role</div>
-        </div>
-        <div v-if="userList.length === 0" class="px-4 py-6 text-slate-400">
-            Aucun utilisateur.
-        </div>
-        <template v-else>
-            <div
-                v-for="user in userList"
-                :key="user.id"
-                class="grid grid-cols-2 text-primary-700 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200 items-center"
-                role="button"
-                tabindex="0"
-                @click="goToUser(user.id)"
-                @keydown.enter="goToUser(user.id)"
-            >
-                <div>{{ user.username }}</div>
-                <div>{{ getRoleLabels(user.roles) }}</div>
-            </div>
-        </template>
-    </div>
-    <div v-else class="mt-7 border border-slate-200 mb-11 px-4 py-6 text-slate-400">
-        Acces reserve aux administrateurs.
-    </div>
-
-    <div class="flex justify-center items-center">
+        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
        <NuxtLink
-            to="/admin/user"
-            class="inline-flex items-center mb-16 justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
-            :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
-            @click="handleAddClick"
+            class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
+            @click="router.push('/admin/user/')"
        >
-            <Icon name="mdi:plus" size="28" />
+            <Icon name="mdi:plus" size="28"  />
            Ajouter
        </NuxtLink>
+
    </div>
+
+    <UiDataTable
+        :columns="columns"
+        url="admin/users"
+        @row-click="onUserRowClick"
+    />
 </template>

-<script setup lang="ts">
-import type { UserData } from "~/services/dto/user-data"
-import { getAdminUsers } from "~/services/auth"
-import { ROLE } from "~/utils/constants"
-import { useAuthStore } from "~/stores/auth"

-const userList = ref<UserData[]>([])
+<script setup lang="ts">
+definePageMeta({
+    layout: 'default'
+})
+
+import {ROLE} from "~/utils/constants";
+import type {ColumnConfig, Row} from "~/services/dto/datatable-data";
+import {formatRoleLabels} from "~/utils/datatable-formatters";
+
 const router = useRouter()
-const auth = useAuthStore()
 const roleLabelByValue = new Map(ROLE.map((role) => [role.value, role.label]))

-const goToUser = (id: number) => {
-    if (!auth.isAdmin) return
+const columns: ColumnConfig[] = [
+    { key: "username", label: "Username" },
+    { key: "roles", label: "Role", format: (value) => formatRoleLabels(value, roleLabelByValue) },
+]
+
+const onUserRowClick = (row: Row) => {
+    const id = Number(row.id)
+    if (!Number.isFinite(id)) return
    router.push(`/admin/user/${id}`)
 }
-
-const handleAddClick = (event: Event) => {
-    if (auth.isAdmin) return
-    event.preventDefault()
-}
-
-const getRoleLabels = (roles?: string[]) => {
-    if (!roles || roles.length === 0) {
-        return '---'
-    }
-
-    return roles
-        .map((role) => roleLabelByValue.get(role) ?? role)
-        .join(', ')
-}
-
-onMounted(async () => {
-    if (!auth.isAdmin) return
-    userList.value = await getAdminUsers()
-})
 </script>
--- a/frontend/pages/index.vue
+++ b/frontend/pages/index.vue
@@ -4,21 +4,21 @@
    <div class="flex flex-wrap justify-center pb-16 gap-12">
        <card-link label="NOUVELLE RÉCEPTION" link="/reception" iconName="mdi:truck-outline" />
        <card-link label="NOUVELLE EXPÉDITION" link="/shipment" iconName="mdi:truck-fast-outline" />
-        <card-link label="PLAN DE SITE" link="/infrastructure/building" iconName="material-symbols:warehouse-outline-rounded" />
-        <card-link link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
+        <card-link label="PLAN DE SITE" link="/" iconName="material-symbols:warehouse-outline-rounded" />
+        <card-link label="" link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
            <template #label>
                Réceptions<br>EN ATTENTE
            </template>
        </card-link>
-        <card-link link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container">
+        <card-link label=""  link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container">
            <template #label>
                EXPÉDITIONS<br>EN ATTENTE
            </template>
        </card-link>
-        <card-link label="CASES" link="/infrastructure/case" iconName="material-symbols:bottom-sheets-outline" />
+        <card-link label="CASES" link="/" iconName="material-symbols:bottom-sheets-outline" />
        <card-link label="RÉCEPTIONS FINIES" link="/reception/finish-reception" iconName="mdi:truck-check-outline" />
        <card-link label="EXPÉDITIONS FINIES" link="/shipment/finish-shipment" iconName="mdi:truck-delivery-outline" />
-        <card-link link="/" iconName="mdi:cow">
+        <card-link label=""  link="/" iconName="mdi:cow">
            <template #label>
                PASSEPORT<br>DU BOVIN
            </template>
--- a/frontend/pages/infrastructure/building.vue
+++ b/frontend/pages/infrastructure/building.vue
@@ -1,242 +0,0 @@
-<template>
-    <div class="min-h-screen">
-        <!-- En-tête de page avec retour et titre -->
-        <div class="flex items-center justify-between mb-8">
-            <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">bâtiments</h1>
-            </div>
-        </div>
-
-        <div class="px-[86px] space-y-6">
-            <!-- Liste des bâtiments + rendu du plan de chaque bâtiment -->
-            <div
-                v-for="entry in buildingLayouts"
-                :key="entry.building.id"
-            >
-                <div class="font-semibold tracking-wide text-primary-500">
-                    {{ entry.building.label || `Bâtiment ${entry.building.id}` }}
-                </div>
-
-                <div class="py-4">
-                    <!-- Aucun layout disponible pour ce bâtiment -->
-                    <div v-if="!entry.layout" class="text-sm text-slate-400">
-                        Aucun plan de bâtiment.
-                    </div>
-
-                    <!-- Grille CSS : les cases sont positionnées via spanStyle -->
-                    <div v-else class="overflow-auto">
-                        <div class="grid" :style="entry.gridStyle">
-                            <NuxtLink
-                                v-for="cell in entry.cells"
-                                :key="cell.key"
-                                class="relative text-white flex h-[50px] items-center justify-center border-y-[3px] border-y-black bg-white hover:opacity-85 focus-visible:outline-none"
-                                :class="[cell.sideBorderClass, activeLegendStatutId !== null && cell.caseStatusId !== activeLegendStatutId ? 'opacity-35 hover:opacity-70' : '']"
-                                :style="[cell.spanStyle, cell.sideBorderStyle]"
-                                :to="cell.caseId ? `/infrastructure/case?id=${cell.caseId}` : '/infrastructure/case'"
-                                :title="cell.caseStatusLabel ?? undefined"
-                            >
-                                <!-- Le blanc latéral est géré sur ce bloc interne (conditionnel par voisinage) -->
-                                <div
-                                    class="flex h-full w-full items-center justify-center bg-white"
-                                    :class="cell.contentInsetClass"
-                                    :style="cell.caseStyle"
-                                >
-                                    <!-- Numéro de case -->
-                                    {{ cell.display }}
-                                </div>
-                            </NuxtLink>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Légende : survol d'un statut => atténue les autres cases -->
-            <div class="py-4">
-                <!-- 3 zones fixes pour forcer gauche / centre / droite sur toute la largeur -->
-                <div class="grid w-full grid-cols-3 gap-3">
-                    <div
-                        v-for="(statut, index) in statutLegend"
-                        :key="statut.id"
-                        class="flex min-w-0 cursor-pointer items-center gap-2 py-1"
-                        :class="[
-                            index === 0 ? 'justify-self-start' : '',
-                            index === statutLegend.length - 1 ? 'justify-self-end' : '',
-                            index > 0 && index < statutLegend.length - 1 ? 'justify-self-center' : ''
-                        ]"
-                        @mouseenter="activeLegendStatutId = statut.id"
-                        @mouseleave="activeLegendStatutId = null"
-                    >
-                        <span
-                            class="h-5 w-5 border border-slate-300"
-                            :style="statut.couleur ? { backgroundColor: statut.couleur } : {}"
-                        ></span>
-                        <span class="truncate text-sm uppercase text-slate-700">
-                            {{ statut.label }}
-                        </span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import type {BuildingData} from "~/services/dto/building-data"
-import type {BuildingLayoutData} from "~/services/dto/building-layout-data"
-import type {BuildingCasePositionData} from "~/services/dto/building-case-position-data"
-import type {BuildingCaseStatusData} from "~/services/dto/building-case-status-data"
-import {getBuildingList} from "~/services/building"
-import {getStatutList} from "~/services/statut"
-
-definePageMeta({layout: "default"})
-
-const router = useRouter()
-// Données brutes chargées depuis l'API
-const buildingList = ref<BuildingData[]>([])
-const statutLegend = ref<BuildingCaseStatusData[]>([])
-// Statut actuellement survolé dans la légende (pour filtrage visuel)
-const activeLegendStatutId = ref<number | null>(null)
-// Modèle de vue prêt pour le template (layout + cellules + styles de grille)
-const buildingLayouts = computed(() =>
-    buildingList.value.map((building) => {
-        // On affiche uniquement le premier layout du bâtiment
-        const layout = building.layouts?.[0] ?? null
-        const view = layout ? buildLayoutView(layout) : null
-        return {building, layout, cells: view?.cells ?? [], gridStyle: view?.gridStyle ?? {}}
-    })
-)
-
-type GridCell = {
-    key: string
-    caseId: number | null
-    display: string
-    caseStatusId: number | null
-    caseStatusLabel: string | null
-    // Couleur de fond de la case (dépend du statut)
-    caseStyle?: Record<string, string>
-    // Placement dans la grille CSS (colonne/ligne de départ + span)
-    spanStyle: Record<string, string>
-    // Bordures latérales pointillées si la case touche un gap ou le bord du plan
-    sideBorderClass: string
-    // Couleur des bordures pointillées latérales (reprend la couleur de la cellule)
-    sideBorderStyle?: Record<string, string>
-    // Espace blanc interne uniquement côté(s) adjacent(s) à une autre case
-    contentInsetClass: string
-}
-// Type intermédiaire : garde des infos utiles au calcul des bordures, retirées ensuite
-type GridCellDraft = Omit<GridCell, "sideBorderClass" | "sideBorderStyle" | "contentInsetClass"> & { x: number; columnSpan: number }
-
-// Nettoie la couleur de statut pour éviter les chaînes vides / espaces
-const normalizeCaseStatusColor = (value: string | null | undefined): string | null => {
-    const color = (value ?? "").trim()
-    return color.length > 0 ? color : null
-}
-
-// Styles de base communs à toutes les grilles de bâtiments
-const BASE_GRID_STYLE = {gridAutoRows: "1fr", rowGap: "18px", columnGap: "0px", width: "100%"} as const
-
-// Transforme un layout API en structure de rendu (cellules + style de grille)
-const buildLayoutView = (layout: BuildingLayoutData): {
-    cells: GridCell[];
-    gridStyle: Record<string, string>
-} | null => {
-    const rows = layout.rows ?? 0, cols = layout.columns ?? 0
-    if (rows <= 0 || cols <= 0) return null
-
-    // Liste des positions de cases (filtre de sécurité sur les valeurs nulles)
-    const positions = (layout.casePositions ?? []).filter(Boolean) as BuildingCasePositionData[]
-    // Colonnes occupées par au moins une case (sert à détecter les gaps)
-    const occupiedColumns = new Set<number>()
-    // Sécurité : si deux positions ont le même x/y, on garde la première
-    const seenCoordinates = new Set<string>()
-    const cellDrafts: GridCellDraft[] = []
-
-    // Tri visuel : de haut en bas, puis de gauche à droite
-    const positionsSorted = [...positions].sort(
-        (leftPosition, rightPosition) =>
-            (leftPosition.y ?? 1) - (rightPosition.y ?? 1) || (leftPosition.x ?? 1) - (rightPosition.x ?? 1)
-    )
-    for (const position of positionsSorted) {
-        const x = position.x ?? 1
-        const y = position.y ?? 1
-        const coordinateKey = `${x}-${y}`
-        if (seenCoordinates.has(coordinateKey)) continue
-        seenCoordinates.add(coordinateKey)
-
-        // w/h = nombre de colonnes / lignes occupées par la case dans la grille
-        const columnSpan = position.w ?? 1
-        const rowSpan = position.h ?? 1
-
-        // Une case peut couvrir plusieurs colonnes : on les marque toutes comme occupées
-        for (let column = x; column < x + columnSpan; column++) {
-            if (column <= cols) occupiedColumns.add(column)
-        }
-
-        // Métadonnées utiles au rendu / navigation / légende
-        const caseId = (position.buildingCase?.id ?? null) as number | null
-        const caseNumber = (position.buildingCase?.caseNumber ?? null) as number | null
-        const caseStatusId = position.buildingCase?.statut?.id ?? null
-        const caseStatusLabel = position.buildingCase?.statut?.label ?? null
-        const statusColor = normalizeCaseStatusColor(position.buildingCase?.statut?.couleur)
-
-        cellDrafts.push({
-            key: `case-${layout.id}-${position.id}`,
-            x,
-            columnSpan,
-            caseId,
-            display: caseNumber !== null ? String(caseNumber) : "Case",
-            caseStatusId,
-            caseStatusLabel,
-            caseStyle: statusColor ? {backgroundColor: statusColor} : undefined,
-            // Exemple : "14 / span 1" => commence en colonne 14 et occupe 1 colonne
-            spanStyle: {gridColumn: `${x} / span ${columnSpan}`, gridRow: `${y} / span ${rowSpan}`}
-        })
-    }
-
-    // Colonnes vides = gaps visuels (plus étroites dans la grille)
-    const gapColumns = Array.from({length: cols}, (_, i) => i + 1).filter((x) => !occupiedColumns.has(x))
-    const gapSet = new Set(gapColumns)
-
-    // Ajoute les bordures latérales pointillées pour les cases au contact d'un gap ou d'un bord
-    const cells: GridCell[] = cellDrafts.map(({x, columnSpan, ...cell}) => {
-        const touchesLeftGapOrEdge = x === 1 || gapSet.has(x - 1)
-        const touchesRightGapOrEdge = x + columnSpan - 1 === cols || gapSet.has(x + columnSpan)
-        const sideBorderClass = [
-            touchesLeftGapOrEdge ? "border-l-[3px] [border-left-style:dashed]" : "",
-            touchesRightGapOrEdge ? "border-r-[3px] [border-right-style:dashed]" : ""
-        ].filter(Boolean).join(" ")
-        // Les pointillés latéraux reprennent la couleur de la cellule (si un statut en fournit une)
-        const sideBorderStyle = {
-            ...(cell.caseStyle?.backgroundColor && touchesLeftGapOrEdge ? {borderLeftColor: cell.caseStyle.backgroundColor} : {}),
-            ...(cell.caseStyle?.backgroundColor && touchesRightGapOrEdge ? {borderRightColor: cell.caseStyle.backgroundColor} : {})
-        }
-        // Le "blanc" n'est ajouté qu'entre deux cellules adjacentes (pas sur bord/gap)
-        const contentInsetClass = [
-            !touchesLeftGapOrEdge ? "ml-[4px]" : "",
-            !touchesRightGapOrEdge ? "mr-[4px]" : ""
-        ].filter(Boolean).join(" ")
-        return {...cell, sideBorderClass, sideBorderStyle, contentInsetClass}
-    })
-
-    // Les colonnes de gap sont rendues en 24px, les autres occupent l'espace restant
-    const columnsTemplate = Array.from({length: cols}, (_, i) => (gapSet.has(i + 1) ? "24px" : "minmax(0, 1fr)")).join(" ")
-    return {cells, gridStyle: {gridTemplateColumns: columnsTemplate, ...BASE_GRID_STYLE}}
-}
-
-onMounted(async () => {
-    // Chargement initial des bâtiments et de la légende des statuts
-    const buildings = await getBuildingList()
-    const statuts = await getStatutList()
-    buildingList.value = buildings
-    // Tri alphabétique FR pour une légende stable
-    statutLegend.value = [...statuts].sort((a, b) =>
-        (a.label ?? "").localeCompare(b.label ?? "", "fr", {sensitivity: "base"})
-    )
-})
-</script>
--- a/frontend/pages/infrastructure/case.vue
+++ b/frontend/pages/infrastructure/case.vue
@@ -1,27 +0,0 @@
-<template>
-    <div class="flex justify-center items-center">
-        <UiButton
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            :disabled="!hasCaseId"
-            @click="printCaseReport"
-        >
-            Imprimer
-        </UiButton>
-    </div>
-</template>
-<script setup lang="ts">
-const route = useRoute()
-const { printPdf } = usePdfPrinter()
-
-const caseId = computed(() => Number(route.query.id))
-const hasCaseId = computed(() => Number.isFinite(caseId.value) && caseId.value > 0)
-
-const printCaseReport = async () => {
-    if (!hasCaseId.value) {
-        return
-    }
-
-    const filename = `tableau_poids_case_${caseId.value}.pdf`
-    await printPdf(`/building_cases/${caseId.value}/weights-report`, filename)
-}
-</script>
--- a/frontend/pages/login.vue
+++ b/frontend/pages/login.vue
@@ -16,7 +16,6 @@
        <select
          id="user-select"
          v-model="selectedUsername"
-          autocomplete="username"
          class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-200"
          :disabled="isLoadingUsers"
        >
--- 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="stepLabels"
+                :labels="RECEPTION_STEP_LABELS"
                :current-step="storeReception?.currentStep ?? 0"
                @select="handleStepSelect"
            />
@@ -15,70 +15,76 @@
        </UiButton>
    </div>
    <ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
-    <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"
-    />
+    <ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
    <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"/>
-    <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"
-    />
+    <ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
 </template>

 <script setup lang="ts">
-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'
+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()

 const receptionStore = useReceptionStore()
-const { current: storeReception } = storeToRefs(receptionStore)
+const {current: storeReception} = storeToRefs(receptionStore)

-const { stepLabels, saveAndHold, handleStepSelect } = useWorkflowSteps(receptionConfig, 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
+}

-// Init route watcher
-const route = useRoute()
 watch(
    () => route.params.id,
    async (param) => {
-        const idStr = Array.isArray(param) ? param[0] : param
-        if (!idStr) {
+        const id = resolveReceptionId(param)
+        if (id === null) {
            receptionStore.clearCurrent()
            return
        }
-        const id = Number(idStr)
-        if (Number.isFinite(id)) {
-            await receptionStore.loadReception(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>
--- a/frontend/pages/reception/finish-reception.vue
+++ b/frontend/pages/reception/finish-reception.vue
@@ -4,72 +4,36 @@
            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions finie</h1>
    </div>

-    <div class="px-[86px]">
-        <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 et heure</div>
-                <div>Fournisseur</div>
-                <div>Adresse</div>
-                <div>Type réception</div>
-                <div>Poids</div>
-            </div>
-            <div
-                v-for="reception in receptionList"
-                :key="reception.id"
-                class="grid grid-cols-6 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)"
-            >
-                <div>{{ reception.identificationNumber}}</div>
-                <div>{{ formatDate(reception.receptionDate) }}</div>
-                <div>{{ reception.supplier?.name }}</div>
-                <div>{{ reception.address?.fullAddress }}</div>
-                <div>{{ reception.receptionType?.label }}</div>
-                <div>{{ formatWeighing(reception) }}</div>
-            </div>
-        </div>
-    </div>
+    <UiDataTable
+        :columns="columns"
+        url="receptions"
+        class="ps-20"
+        :query="{ isValid: true }"
+        @row-click="goToReception"
+    />
 </template>

 <script setup lang="ts">
-import type {ReceptionData} from "~/services/dto/reception-data";
-import {getReceptionList} from "~/services/reception";
-import type {ShipmentData} from "~/services/dto/shipment-data";

-const receptionList = ref<ReceptionData[]>()
+import {formatWeights} from "~/utils/datatable-formatters";
+
+type ReceptionRow = {
+    id?: number | string
+}
+
 const router = useRouter()
+const columns = [
+    { key: 'identificationNumber', label: 'Numero', isSearchable:true },
+    { key: 'receptionDate', label: 'Date de livraison', isSearchable: true, type: 'date' },
+    { key: 'supplier.name', label: 'Fournisseur', isSearchable: true },
+    { key: 'address.fullAddress', label: 'Adresse', isSearchable: true },
+    { key: 'receptionType.label', label: 'Type', isSearchable: true, type:'selectTypeReception' },
+    { key: 'weights', label: 'Poids', format: formatWeights }
+]

-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
-
-    if (gross == null || tare == null) {
-        return '—'
-    }
-
-    return `${gross - tare} kg`
-}
-
-const goToReception = (id: number) => {
+const goToReception = (row: ReceptionRow) => {
+    const id = Number(row?.id)
+    if (!Number.isFinite(id)) return
    router.push(`/reception/update/${id}`)
 }
-
-onMounted(async () => {
-    receptionList.value = await getReceptionList(true)
-})
 </script>
--- a/frontend/pages/reception/update/[[id]].vue
+++ b/frontend/pages/reception/update/[[id]].vue
--- a/frontend/pages/reception/waiting-reception.vue
+++ b/frontend/pages/reception/waiting-reception.vue
@@ -1,64 +1,36 @@
 <template>
-    <WorkflowWaitingList
-        title="listes des réceptions en attente"
+    <div class="flex items-center justify-start 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>
+    <UiDataTable
        :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>
+        url="receptions"
+        :query="{ isValid: false }"
+        @row-click="goToReception"
+    />
 </template>

 <script setup lang="ts">
-import type { ReceptionData } from '~/services/dto/reception-data'
-import { getReceptionList, deleteReception } from '~/services/reception'
+const router = useRouter()
+
+

 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' }
+    {key: 'supplier.name', label: 'Fournisseur', isSearchable:true},
+    { key: 'address.fullAddress', label: 'Adresse', isSearchable: true },
+    {key: 'carrier.name', label: 'Transporteur', isSearchable:true},
+    {key: 'receptionType.label', label: 'Type', isSearchable:true, type:'selectTypeReception'},
+    {key: 'licensePlate', label: 'Immatriculation', isSearchable:true, type:'licensePlate'},
 ]

-const receptionList = ref<ReceptionData[]>()

-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'
-    })
+type ReceptionRow = {
+    id?: number | string
 }
-
-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)
+const goToReception = (row: ReceptionRow) => {
+    const id = Number(row?.id)
+    if (!Number.isFinite(id)) return
+        router.push(`/reception/${id}`)
 }
-
-onMounted(async () => {
-    receptionList.value = await getReceptionList(false)
-})
 </script>
--- a/frontend/pages/shipment/[[id]].vue
+++ b/frontend/pages/shipment/[[id]].vue
@@ -3,9 +3,10 @@
        <div class="flex justify-between h-[52px] mb-[80px]">
            <div class="flex flex-1 mr-16">
                <UiStepper
-                    :labels="stepLabels"
+                    :labels="SHIPMENT_STEP_LABELS"
                    :current-step="storeShipment?.currentStep ?? 0"
                    @select="handleStepSelect"
+
                />
            </div>
            <UiButton
@@ -16,69 +17,45 @@
            </UiButton>
        </div>
        <ShipmentForm v-if="!storeShipment || storeShipment.currentStep === 0" ref="shipmentFormRef"/>
-        <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"
-        />
+        <ShipmentWeight v-if="storeShipment?.currentStep === 1" mode="gross"/>
        <ShipmentLoading v-if="storeShipment?.currentStep === 2"/>
-        <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"
-        />
+        <ShipmentWeight v-if="storeShipment?.currentStep === 3" mode="tare"/>
+
    </div>
 </template>
-
 <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 {SHIPMENT_STEP_LABELS} from "~/constants/steps";
+import {storeToRefs} from "pinia";
+import {useShipmentStore} from "~/stores/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()

-watch(
+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 (
    () => route.params.id,
    async (param) => {
-        const idStr = Array.isArray(param) ? param[0] : param
-        if (!idStr) {
+        const id = resolveShipmentId(param)
+        if (id === null) {
            shipmentStore.clearCurrent()
            return
        }
-        const id = Number(idStr)
-        if (Number.isFinite(id)) {
-            await shipmentStore.loadShipment(id)
-        }
+        await shipmentStore.loadShipment(id)
    },
-    { immediate: true }
+    {immediate: true}
 )

 const saveAndHold = async () => {
@@ -87,4 +64,20 @@ 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>
--- a/frontend/pages/shipment/finish-shipment.vue
+++ b/frontend/pages/shipment/finish-shipment.vue
@@ -4,82 +4,32 @@
        <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions finie</h1>
    </div>

-    <div class="px-[86px]">
-        <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>Client</div>
-                <div>Adresse</div>
-                <div>Type d'expéditon</div>
-                <div>Poids</div>
-            </div>
-            <div
-                v-for="shipment in shipmentList"
-                :key="shipment
-               .id"
-                class="grid grid-cols-6 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
-                role="button"
-                tabindex="0"
-                @click="goShipment(shipment.id)"
-            >
-                <div>{{ shipment.identificationNumber }}</div>
-                <div>{{ shipment.shipmentDate }}</div>
-                <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>
-                </div>
-                <div>{{ formatWeighing(shipment) }}</div>
-            </div>
-        </div>
-    </div>
+    <UiDataTable
+        :columns="columns"
+        url="shipments"
+        :query="{ isValid: true }"
+        @row-click="goToShipment"
+    />
 </template>

 <script setup lang="ts">
-import type {ShipmentData} from "~/services/dto/shipment-data";
-import {getShipmentList} from "~/services/shipment";
+import {formatBovinShipments, formatWeights} from "~/utils/datatable-formatters";

-const shipmentList = ref<ShipmentData[]>()
 const router = useRouter()
-
-const formatWeighing = (shipment: ShipmentData) => {
-    const gross = shipment.weights?.find((weight) => weight.type === 'gross')?.weight
-    const tare = shipment.weights?.find((weight) => weight.type === 'tare')?.weight
-
-    if (gross == null || tare == null) {
-        return '—'
-    }
-
-    return `${gross - tare} kg`
+const columns = [
+    {key: 'identificationNumber', label: 'Numero',isSearchable:true},
+    {key: 'shipmentDate', label: 'Date de livraison',isSearchable:true, type:'date'},
+    {key: 'customer.name', label: 'Client',isSearchable:true},
+    {key: 'address.fullAddress', label: 'Adresse',isSearchable:true},
+    {key: 'bovinShipments', label: 'Type', format:formatBovinShipments},
+    {key: 'weights', label: 'Poids', format: formatWeights}
+]
+type ReceptionRow = {
+    id?: number | string
 }
-
-
-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 goShipment = (id: number) => {
+const goToShipment = (row: ReceptionRow) => {
+    const id = Number(row?.id)
+    if (!Number.isFinite(id)) return
    router.push(`/shipment/update/${id}`)
 }
-
-onMounted(async () => {
-    shipmentList.value = await getShipmentList(true)
-})
 </script>
--- a/frontend/pages/shipment/update/[[id]].vue
+++ b/frontend/pages/shipment/update/[[id]].vue
@@ -1,675 +0,0 @@
-<template>
-    <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>
-                <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
-                id="shipment-user"
-                v-model="form.userId"
-                label="Nom de l'utilisateur"
-                :options="users.map((user) => ({
-                    value: String(user.id),
-                    label: user.username
-                }))"
-                :loading="isLoadingUsers"
-                wrapper-class="col-start-1 row-start-2"
-                required
-            />
-
-            <UiDateInput
-                id="shipment-date"
-                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]">
-                <div class="flex w-full items-end gap-[104px]">
-                    <UiRadioGroup
-                        id="shipment-type"
-                        name="shipment-type"
-                        label="Type d'expédition bovine"
-                        input-class="accent-primary-700 focus:ring-primary-700"
-                        group-class="flex flex-row gap-[104px] w-[160px_160px] h-[32px]"
-                        v-model="selectedShipmentTypeId"
-                        :options="bovineShipment.map((type) => ({
-                            value: String(type.id),
-                            label: type.label
-                        }))"
-                        required
-                    />
-                    <UiNumberInput
-                        id="shipment-type-quantity"
-                        v-model="shipmentQuantity"
-                        :placeholder="0"
-                        :min="0"
-                        :max="1200"
-                        :disabled="!selectedShipmentTypeId"
-                    />
-                </div>
-            </div>
-
-            <UiSelect
-                id="shipment-customer"
-                v-model="form.customerId"
-                label="Client"
-                :options="customers.map((customer) => ({
-                    value: String(customer.id),
-                    label: customer.name || `Client #${customer.id}`
-                }))"
-                :loading="isLoadingCustomers"
-                wrapper-class="col-start-1 row-start-5"
-                required
-            />
-
-            <UiSelect
-                id="shipment-address"
-                v-model="form.addressId"
-                :options="customerAddressOptions"
-                :disabled="isLoadingCustomers || customerAddresses.length === 0"
-                label="Adresse"
-                wrapper-class="col-start-2 row-start-1"
-                required
-            />
-
-            <UiSelect
-                id="shipment-truck"
-                v-model="form.truckId"
-                label="Camion"
-                :options="trucks.map((truck) => ({
-                    value: String(truck.id),
-                    label: truck.name
-                }))"
-                :loading="isLoadingTrucks"
-                wrapper-class="col-start-2 row-start-2"
-                required
-            />
-
-            <UiSelect
-                id="shipment-carrier"
-                v-model="form.carrierId"
-                label="Transporteur"
-                :options="carriers.map((carrier) => ({
-                    value: String(carrier.id),
-                    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>
-
-            <UiSelect
-                v-if="isLiotCarrier"
-                id="shipment-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="col-start-2 row-start-4"
-                required
-            />
-
-            <div class="col-start-2 row-start-5 min-h-[72px]">
-                <UiSelect
-                    v-if="isLiotCarrier"
-                    id="shipment-driver"
-                    v-model="form.driverId"
-                    label="Nom du chauffeur si LIOT"
-                    :options="filteredDrivers.map((driver) => ({
-                        value: String(driver.id),
-                        label: driver.name
-                    }))"
-                    :loading="isLoadingDrivers"
-                    required
-                />
-            </div>
-        </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',
-                        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',
-                        hasTareWeightError ? '!text-red-500 !border-red-500' : ''
-                    ]"
-                    @click="activeTab = 'weightsEmpty'"
-                >
-                    pesée à vide
-                </h1>
-            </div>
-            <div class="mb-12">
-                <update-weight
-                    v-show="activeTab === 'weights'"
-                    v-model="grossWeight"
-                    v-if="grossWeight"
-                    :isAdmin="authStore.isAdmin"
-                />
-                <update-weight
-                    v-show="activeTab === 'weightsEmpty'"
-                    v-model="tareWeight"
-                    v-if="tareWeight"
-                    :isAdmin="authStore.isAdmin"
-                />
-            </div>
-        </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 { usePdfPrinter } from '#imports'
-import { computed, onMounted, reactive, ref, watch } from 'vue'
-import UpdateWeight from '~/components/commun/update-weight.vue'
-import { getUsers } from '~/services/auth'
-import { getCarrierList } from '~/services/carrier'
-import { getCustomerList } from '~/services/customer'
-import type { AddressData } from '~/services/dto/address-data'
-import type { CarrierData } from '~/services/dto/carrier-data'
-import type { CustomerData } from '~/services/dto/customer-data'
-import type { DriverData } from '~/services/dto/driver-data'
-import type { ShipmentData, ShipmentFormData } from '~/services/dto/shipment-data'
-import type { ShipmentTypeData } from '~/services/dto/shipment-type-data'
-import type { TruckData } from '~/services/dto/truck-data'
-import type { UserData } from '~/services/dto/user-data'
-import type { VehicleData } from '~/services/dto/vehicle-data'
-import type { WeightEntryData } from '~/services/dto/weight-data'
-import { getDriverList } from '~/services/driver'
-import { getShipment, updateShipment } from '~/services/shipment'
-import { getShipmentTypeList } from '~/services/shipment-type'
-import { getTruckList } from '~/services/truck'
-import { getVehicleList } from '~/services/vehicle'
-import { createWeight, updateWeight } from '~/services/weight'
-import { useAuthStore } from '~/stores/auth'
-import { SUPPLIER_CODE } from '~/utils/constants'
-
-const router = useRouter()
-const route = useRoute()
-const authStore = useAuthStore()
-const { printPdf } = usePdfPrinter()
-
-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 bovineShipment = ref<ShipmentTypeData[]>([])
-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'))
-const formIsLoading = ref(false)
-
-const isLoadingUsers = ref(false)
-const isLoadingShipmentTypes = ref(false)
-const isLoadingCustomers = ref(false)
-const isLoadingTrucks = ref(false)
-const isLoadingCarriers = ref(false)
-const isLoadingVehicles = ref(false)
-const isLoadingDrivers = ref(false)
-const isHydrating = ref(false)
-
-const form = reactive<ShipmentFormData & { identificationNumber: string | null }>({
-    identificationNumber: null,
-    userId: '',
-    shipmentDate: new Date().toISOString().slice(0, 10),
-    customerId: '',
-    addressId: '',
-    truckId: '',
-    carrierId: '',
-    driverId: '',
-    vehicleId: '',
-    licensePlate: ''
-})
-
-const shipmentId = computed(() => {
-    const id = Number(route.params.id)
-    return Number.isFinite(id) ? id : null
-})
-
-const selectedCarrier = computed(() =>
-    carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
-)
-const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
-const isAddressData = (value: unknown): value is AddressData =>
-    typeof value === 'object' &&
-    value !== null &&
-    'id' in value &&
-    'fullAddress' in value
-
-const customerAddresses = computed<AddressData[]>(() => {
-    if (!form.customerId) return []
-    const customerId = Number(form.customerId)
-    if (!Number.isFinite(customerId) || customerId <= 0) return []
-
-    const addresses = customers.value.find((c) => c.id === customerId)?.addresses ?? []
-    return addresses.filter(isAddressData)
-})
-
-const customerAddressOptions = computed(() =>
-    customerAddresses.value.map((address) => ({
-        value: String(address.id),
-        label: address.fullAddress
-    }))
-)
-
-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 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 loadCustomers = async () => {
-    isLoadingCustomers.value = true
-    try {
-        customers.value = await getCustomerList()
-    } 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
-    }
-}
-
-function setDefaultUser() {
-    if (form.userId) {
-        return
-    }
-    if (authStore.user?.id) {
-        form.userId = String(authStore.user.id)
-    }
-}
-
-function hydrateFromShipment(shipment: ShipmentData | null) {
-    if (!shipment) {
-        return
-    }
-
-    isHydrating.value = true
-    form.identificationNumber = shipment.identificationNumber ?? null
-    form.licensePlate = shipment.licensePlate ?? ''
-    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) : ''
-    shipmentQuantity.value = shipment.nbBovinSend ?? 0
-    const gross = shipment.weights?.find((weight) => weight.type === 'gross') ?? null
-    const tare = shipment.weights?.find((weight) => weight.type === 'tare') ?? null
-    grossWeight.value = gross ? { ...gross } : createEmptyWeightEntry('gross')
-    tareWeight.value = tare ? { ...tare } : createEmptyWeightEntry('tare')
-    isHydrating.value = false
-}
-
-async function printReceipt() {
-    if (!import.meta.client || shipmentId.value === null || shipmentId.value <= 0) {
-        return
-    }
-
-    const customerName =
-        customers.value.find((customer) => String(customer.id) === form.customerId)?.name ??
-        'client'
-    const filename = `${form.identificationNumber || shipmentId.value}_${customerName}_${form.licensePlate || 'immat'}.pdf`
-    await printPdf(`/shipments/${shipmentId.value}/receipt`, filename)
-    await new Promise((resolve) => setTimeout(resolve, 600))
-}
-
-async function loadShipmentForUpdate() {
-    if (shipmentId.value === null) {
-        return
-    }
-    const shipment = await getShipment(shipmentId.value)
-    currentShipment.value = shipment
-    hydrateFromShipment(shipment)
-}
-
-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 }
-)
-
-function 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 }
-)
-
-watch(
-    () => isHydrating.value,
-    (value) => {
-        if (!value) {
-            applyLiotDefaults()
-        }
-    }
-)
-
-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 }
-)
-
-watch(
-    () => [form.vehicleId, form.carrierId, vehicles.value],
-    () => {
-        if (!isLiotCarrier.value || 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)
-        }
-    }
-)
-
-function buildPayload() {
-    const normalizedLicensePlate = form.licensePlate.trim()
-    const normalizedShipmentDate = form.shipmentDate.trim()
-    const normalizedCustomerId = form.customerId.trim()
-    const normalizedTruckId = form.truckId.trim()
-    const normalizedCarrierId = form.carrierId.trim()
-    const normalizedDriverId = form.driverId.trim()
-    const normalizedUserId = form.userId.trim()
-    const normalizedAddressId = form.addressId.trim()
-    const normalizedShipmentTypeId = selectedShipmentTypeId.value.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 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
-
-    return {
-        licensePlate: normalizedLicensePlate,
-        shipmentDate: normalizedShipmentDate,
-        customer: customerIri,
-        truck: truckIri,
-        carrier: carrierIri,
-        driver: driverIri,
-        user: userIri,
-        address: addressIri,
-        shipmentType: shipmentTypeIri,
-        nbBovinSend: normalizedQuantity
-    }
-}
-
-function createEmptyWeightEntry(type: 'gross' | 'tare'): WeightEntryData {
-    return {
-        type,
-        dsd: null,
-        weight: null,
-        weighedAt: null
-    }
-}
-
-async function saveWeightEntry(entry: WeightEntryData) {
-    if (!shipmentId.value || entry.weight === null) {
-        return
-    }
-
-    const payload = {
-        type: entry.type,
-        dsd: entry.dsd ?? null,
-        weight: entry.weight,
-        weighedAt: entry.weighedAt ?? null
-    }
-
-    if (entry.id) {
-        await updateWeight(entry.id, payload)
-        return
-    }
-
-    await createWeight({
-        shipment: `api/shipments/${shipmentId.value}`,
-        ...payload
-    })
-}
-
-async function validate() {
-    if (shipmentId.value === null) {
-        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()
-    })
-    await saveWeightEntry(grossWeight.value)
-    await saveWeightEntry(tareWeight.value)
-
-    await loadShipmentForUpdate()
-}
-
-onMounted(async () => {
-    await loadShipmentType()
-    await loadUsers()
-    await loadCustomers()
-    await loadTrucks()
-    await loadCarriers()
-    await loadVehicles()
-    await loadDrivers()
-    await authStore.ensureSession()
-    formIsLoading.value = true
-    setDefaultUser()
-    await loadShipmentForUpdate()
-})
-</script>
--- a/frontend/pages/shipment/waiting-shipment.vue
+++ b/frontend/pages/shipment/waiting-shipment.vue
@@ -1,86 +1,38 @@
 <template>
-    <WorkflowWaitingList
-        title="listes des expéditions en attente"
+    <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>
+    <UiDataTable
        :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>
-            </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>
+        url="shipments"
+        :query="{ isValid: false }"
+        @row-click="goToShipment"
+    />
 </template>

 <script setup lang="ts">
-import type { ShipmentData } from '~/services/dto/shipment-data'
-import { getShipmentList, deleteShipment } from '~/services/shipment'
+import {formatBovinShipments} from "~/utils/datatable-formatters";
+
+const router = useRouter()

 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' }
+    {key: 'customer.name', label: 'Client', isSearchable:true},
+    {key: 'address.fullAddress', label: 'Adresse', isSearchable:true},
+    {key: 'carrier.name', label: 'Transporteur', isSearchable:true},
+    {key: 'bovinShipments', label: 'Type', format:formatBovinShipments},
+    {key: 'licencePlate', label: 'Immatriculation', isSearchable:true},
 ]

-const shipmentList = ref<ShipmentData[]>()
-
-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'
-    })
+type ReceptionRow = {
+    id?: number | string
 }

-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 goToShipment = (row: ReceptionRow) => {
+    const id = Number(row?.id)
+    if (!Number.isFinite(id)) return
+    router.push(`/shipment/${id}`)
 }
-
-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)
-})
 </script>
--- a/frontend/services/address.ts
+++ b/frontend/services/address.ts
@@ -1,6 +1,7 @@
 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
--- a/frontend/services/bovin-shipment.ts
+++ b/frontend/services/bovin-shipment.ts
@@ -0,0 +1,50 @@
+import { useApi } from '~/composables/useApi'
+import type { BovinShipmentData } from '~/services/dto/bovin-shipment-data'
+import type { ShipmentBovinePayload, BovinShipmentListResponse } from '~/services/dto/bovin-shipment-data'
+
+export async function getBovinShipmentList(
+    shipmentIri: string
+): Promise<BovinShipmentData[]> {
+    const api = useApi()
+    const response = await api.get<BovinShipmentListResponse>(
+        'bovin_shipments',
+        { shipment: shipmentIri },
+        {
+            toastErrorKey: 'errors.shipmentBovine.list'
+        }
+    )
+
+    if (Array.isArray(response)) {
+        return response
+    }
+    if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
+        return response['hydra:member']
+    }
+    return []
+}
+
+export async function createShipmentBovine(
+    payload: ShipmentBovinePayload
+): Promise<BovinShipmentData> {
+    const api = useApi()
+    return api.post<BovinShipmentData>('bovin_shipments', payload, {
+        toastErrorKey: 'errors.shipmentBovine.create'
+    })
+}
+
+export async function deleteShipmentBovine(id: number): Promise<void> {
+    const api = useApi()
+    await api.delete<void>(`bovin_shipments/${id}`, {}, {
+        toastErrorKey: 'errors.shipmentBovine.delete'
+    })
+}
+
+export async function updateShipmentBovine(
+    id: number,
+    payload: Partial<ShipmentBovinePayload>
+): Promise<BovinShipmentData> {
+    const api = useApi()
+    return api.patch<BovinShipmentData>(`bovin_shipments/${id}`, payload, {
+        toastErrorKey: 'errors.shipmentBovine.update'
+    })
+}
--- a/frontend/services/bovine-type.ts
+++ b/frontend/services/bovine-type.ts
@@ -24,27 +24,19 @@ export async function getBovineTypeList(): Promise<BovineTypeData[]> {

 export async function getBovin(id: number): Promise<BovineTypeData> {
    const api = useApi()
-    const response = await api.get<BovineTypeData>(`bovine_types/${id}`, {}, {
-        toastErrorKey: 'errors.bovin.fetch'
-    })
+    const response = await api.get<BovineTypeData>(`bovine_types/${id}`)
    return mapToBovineTypeData(response)
 }

 export async function createBovin(payload: BovinPayload = {}): Promise<BovineTypeData> {
    const api = useApi()
-    const response = await api.post<BovineTypeData>('bovine_types', toBovineTypePayload(payload), {
-        toastErrorKey: 'errors.bovin.create',
-        toastSuccessKey: 'success.bovin.create'
-    })
+    const response = await api.post<BovineTypeData>('bovine_types', toBovineTypePayload(payload))
    return mapToBovineTypeData(response)
 }

 export async function updateBovin(id: number, payload: BovinPayload = {}): Promise<BovineTypeData> {
    const api = useApi()
-    const response = await api.patch<BovineTypeData>(`bovine_types/${id}`, toBovineTypePayload(payload), {
-        toastErrorKey: 'errors.bovin.update',
-        toastSuccessKey: 'success.bovin.update'
-    })
+    const response = await api.patch<BovineTypeData>(`bovine_types/${id}`, toBovineTypePayload(payload))
    return mapToBovineTypeData(response)
 }

--- 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 | null
+    label: string
    street: string
    street2?: string | null
    postalCode: string
@@ -11,7 +11,7 @@ export interface AddressData {

 export interface AddressFormData {
    id?: number | null
-    label?: string | null
+    label: string
    street: string
    street2?: string | null
    postalCode: string
--- a/frontend/services/dto/bovin-shipment-data.ts
+++ b/frontend/services/dto/bovin-shipment-data.ts
@@ -0,0 +1,18 @@
+import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
+
+export interface BovinShipmentData {
+    id: number
+    nbBovinSend: number | null
+    shipment?: string | null
+    shipmentType?: ShipmentTypeData | null
+}
+
+export type ShipmentBovinePayload = {
+    nbBovinSend: number
+    shipment: string
+    shipmentType: string
+}
+
+export type BovinShipmentListResponse =
+    | BovinShipmentData[]
+    | { 'hydra:member'?: BovinShipmentData[] }
--- a/frontend/services/dto/building-case-data.ts
+++ b/frontend/services/dto/building-case-data.ts
@@ -1,9 +0,0 @@
-import type { BuildingCaseStatusData } from '~/services/dto/building-case-status-data'
-
-export interface BuildingCaseData {
-    id: number
-    caseNumber: number | null
-    code: string | null
-    capacity: number | null
-    statut?: BuildingCaseStatusData | null
-}
--- a/frontend/services/dto/building-case-position-data.ts
+++ b/frontend/services/dto/building-case-position-data.ts
@@ -1,11 +0,0 @@
-import type { BuildingCaseData } from '~/services/dto/building-case-data'
-
-export interface BuildingCasePositionData {
-    id: number
-    x: number | null
-    y: number | null
-    w: number | null
-    h: number | null
-    renderOrder: string | null
-    buildingCase: BuildingCaseData | null
-}
--- a/frontend/services/dto/building-case-status-data.ts
+++ b/frontend/services/dto/building-case-status-data.ts
@@ -1,6 +0,0 @@
-export interface BuildingCaseStatusData {
-    id: number
-    label: string | null
-    code: string | null
-    couleur: string | null
-}
--- a/frontend/services/dto/building-data.ts
+++ b/frontend/services/dto/building-data.ts
@@ -1,8 +1,5 @@
-import type { BuildingLayoutData } from '~/services/dto/building-layout-data'
-
 export interface BuildingData {
    id: number
    label: string
    code: string
-    layouts?: BuildingLayoutData[] | null
 }
--- a/frontend/services/dto/building-layout-data.ts
+++ b/frontend/services/dto/building-layout-data.ts
@@ -1,9 +0,0 @@
-import type { BuildingCasePositionData } from '~/services/dto/building-case-position-data'
-
-export interface BuildingLayoutData {
-    id: number
-    name: string | null
-    columns: number | null
-    rows: number | null
-    casePositions?: BuildingCasePositionData[] | null
-}
--- a/frontend/services/dto/customer-data.ts
+++ b/frontend/services/dto/customer-data.ts
@@ -1,5 +1,4 @@
 import type { AddressFormData } from "~/services/dto/address-data"
-import type { UserData } from "~/services/dto/user-data"

 export type CustomerAddresses = AddressFormData[] | string[]

@@ -8,7 +7,6 @@ export interface CustomerData {
    name: string
    phone?: string | null
    email?: string | null
-    createdBy?: UserData | null
    addresses: CustomerAddresses
 }

--- a/frontend/services/dto/datatable-data.ts
+++ b/frontend/services/dto/datatable-data.ts
@@ -0,0 +1,20 @@
+export type Row = Record<string, unknown>
+
+export type ColumnConfig = {
+    key: string
+    label?: string
+    format?: (value: unknown, row: Row) => string
+    isSearchable?: boolean
+    type?: string
+}
+type HydraCollection<T> = {
+    'hydra:member': T[]
+    'hydra:totalItems': number
+}
+export type AnyCollection<T> = HydraCollection<T> & {
+    member?: T[]
+    items?: T[]
+    totalItems?: number
+}
+
+export type PaginationItem = number | '...'
--- a/frontend/services/dto/reception-data.ts
+++ b/frontend/services/dto/reception-data.ts
@@ -41,18 +41,9 @@ export interface WeightEntryData {
    weighedAt: string | null
 }

-export interface MerchandiseEntryData {
-    merchandiseTypeId: string
-    merchandiseDetail: string
-    selectedBuildingIds: string[]
-    selectedPelletBuildingIds: Record<string, string[]>
-}
-
 export interface WeightFormData {
    id: number
    weight: number
-    weighedAt : string
-    dsd: number
    type: 'gross' | 'tare'
 }

@@ -78,7 +69,6 @@ export type ReceptionPayload = {
 }

 export type ReceptionFormData = {
-    identificationNumber?: null|string,
    licensePlate: string
    receptionDate: string
    receptionTypeId: string
@@ -89,7 +79,6 @@ export type ReceptionFormData = {
    carrierId: string
    driverId: string
    vehicleId: string
-    weight?: ReceptionFormWeight | null
 }

 export type ReceptionFormWeight = {
--- a/frontend/services/dto/shipment-data.ts
+++ b/frontend/services/dto/shipment-data.ts
@@ -2,9 +2,6 @@ import type {CarrierData} from '~/services/dto/carrier-data'
 import type {TruckData} from '~/services/dto/truck-data'
 import type {CustomerData} from '~/services/dto/customer-data'
 import type {AddressData} from "~/services/dto/address-data";
-import type {UserData} from '~/services/dto/user-data'
-import type {DriverData} from '~/services/dto/driver-data'
-import type {VehicleData} from '~/services/dto/vehicle-data'

 export interface ShipmentTypeData {
    id: number
@@ -12,10 +9,16 @@ export interface ShipmentTypeData {
    code: string
 }

+export interface BovinShipmentData {
+    id?: number
+    shipmentType?: ShipmentTypeData | string | null
+    nbBovinSend: number | null
+}
+
 export type ShipmentData = {
    id: number
    identificationNumber?: string | null
-    licensePlate: string | null
+    licencePlate: string | null
    shipmentDate: string
    currentStep: number
    isValid: boolean
@@ -23,11 +26,7 @@ export type ShipmentData = {
    carrier?: CarrierData | null
    truck?: TruckData | null
    customer?: CustomerData | null
-    user?: UserData | null
-    driver?: DriverData | null
-    vehicle?: VehicleData | null
-    shipmentType?: ShipmentTypeData | null
-    nbBovinSend?: number | null
+    bovinShipments?: BovinShipmentData[] | null
    weights?: WeightShipmentEntryData[] | null

 }
@@ -49,20 +48,20 @@ export type ShipmentFormData = {
    carrierId: string,
    driverId: string,
    vehicleId: string,
-    licensePlate: string,
+    licencePlate: string,
 }

 export type ShipmentPayload = {
-    licensePlate?: string | null
+    licencePlate?: string | null
    shipmentDate?: string
    currentStep?: number
    isValid?: boolean
    carrier?: string | null
    truck?: string | null
    customer?: string | null
+    bovinShipments?: string[] | null
    address?: string | null
    user?: string | null
    driver?: string | null
-    shipmentType?: string | null
-    nbBovinSend?: number | null
+
 }
--- a/frontend/services/dto/supplier-data.ts
+++ b/frontend/services/dto/supplier-data.ts
@@ -1,5 +1,4 @@
 import type { AddressFormData } from "~/services/dto/address-data"
-import type { UserData } from "~/services/dto/user-data"

 export type SupplierAddresses = AddressFormData[] | string[]

@@ -8,7 +7,6 @@ export interface SupplierData {
    name: string
    email?: string | null
    phone?: string | null
-    createdBy?: UserData | null
    addresses: SupplierAddresses
 }

--- a/frontend/services/dto/weight-data.ts
+++ b/frontend/services/dto/weight-data.ts
@@ -4,11 +4,3 @@ export interface WeightData {
    weighedAt: string | null
    type : string | null
 }
-
-export interface WeightEntryData {
-    id?: number
-    type: 'gross' | 'tare'
-    dsd: number | null
-    weight: number | null
-    weighedAt: string | null
-}
--- a/frontend/services/geo.ts
+++ b/frontend/services/geo.ts
@@ -1,16 +0,0 @@
-export interface CommuneData {
-  nom: string
-  code: string
-}
-
-export async function getCommunesByPostalCode(postalCode: string): Promise<CommuneData[]> {
-  const config = useRuntimeConfig()
-  const base = config.public.geoApiBase
-  try {
-    return await $fetch<CommuneData[]>(`${base}/communes`, {
-      params: { codePostal: postalCode, fields: 'nom', format: 'json' }
-    })
-  } catch {
-    return []
-  }
-}
--- a/frontend/services/reception.ts
+++ b/frontend/services/reception.ts
@@ -1,22 +1,41 @@
-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'
+import {useApi} from '~/composables/useApi'
+import type {ReceptionData, ReceptionPayload} from '~/services/dto/reception-data'
+import type {WeightData} from '~/services/dto/weight-data'

-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) {
+export async function getReceptionList(isValid: boolean|null = null) {
    const api = useApi()
-    return api.delete(`receptions/${id}`, {}, {
-        toastSuccessKey: 'success.reception.delete',
-        toastErrorKey: 'errors.reception.delete'
+    const query = isValid !== null ? { isValid: isValid} : {}
+    return api.get<ReceptionData[]>('receptions', query, {
+        toastErrorKey: 'errors.reception.list'
    })
 }

-export { service as receptionService }
+
+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, {
+        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'
+    })
+}
--- a/frontend/services/shipment.ts
+++ b/frontend/services/shipment.ts
@@ -1,22 +1,40 @@
-import { createWorkflowService } from '~/services/workflow-service'
-import type { ShipmentData, ShipmentPayload } from '~/services/dto/shipment-data'
-import type { WeightData } from '~/services/dto/weight-data'
+import {useApi} from '~/composables/useApi'
+import type {ShipmentData, ShipmentPayload} from '~/services/dto/shipment-data'
+import type {WeightData} from '~/services/dto/weight-data'

-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')
+export async function getShipmentList(isValid: boolean|null = null) {
    const api = useApi()
-    return api.delete(`shipments/${id}`, {}, {
-        toastSuccessKey: 'success.shipment.delete',
-        toastErrorKey: 'errors.shipment.delete'
+    const query = isValid !== null ? { isValid: isValid} : {}
+    return api.get<ShipmentData[]>('shipments', query, {
+        toastErrorKey: 'errors.shipment.list'
    })
 }

-export { service as shipmentService }
+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 = {}) {
+    const api = useApi()
+    return api.post<ShipmentData>('shipments', payload, {
+        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'
+    })
+}
--- a/frontend/services/statut.ts
+++ b/frontend/services/statut.ts
@@ -1,23 +0,0 @@
-import { useApi } from '~/composables/useApi'
-import type { BuildingCaseStatusData } from '~/services/dto/building-case-status-data'
-
-export type StatutListResponse =
-    | BuildingCaseStatusData[]
-    | { 'hydra:member'?: BuildingCaseStatusData[] }
-
-export async function getStatutList(): Promise<BuildingCaseStatusData[]> {
-    const api = useApi()
-    const response = await api.get<StatutListResponse>('statuts', {}, {
-        toastErrorKey: 'errors.http.get'
-    })
-
-    if (Array.isArray(response)) {
-        return response
-    }
-
-    if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
-        return response['hydra:member']
-    }
-
-    return []
-}
--- a/frontend/services/weight.ts
+++ b/frontend/services/weight.ts
@@ -1,5 +1,8 @@
 import { useApi } from '~/composables/useApi'
-import type { WeightEntryData } from '~/services/dto/reception-data'
+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";

 export type WeightPayload = {
    reception?: string
@@ -10,15 +13,29 @@ export type WeightPayload = {
    weighedAt: string | null
 }

-export async function createWeight(payload: WeightPayload | Record<string, any>) {
+export async function createWeight(payload: WeightPayload) {
    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>
+}
--- a/frontend/services/workflow-service.ts
+++ b/frontend/services/workflow-service.ts
@@ -1,55 +0,0 @@
-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 }
-}
--- a/frontend/stores/reception.ts
+++ b/frontend/stores/reception.ts
@@ -1,19 +1,59 @@
 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'

-export const useReceptionStore = defineStore('reception', () => {
-    const { current, isLoading, setCurrent, clearCurrent, load, create, update } =
-        useWorkflowStoreLogic<ReceptionData, ReceptionPayload>(receptionService)
+const isReceptionData = (value: unknown): value is ReceptionData => {
+  return Boolean(value && typeof value === 'object' && 'id' in value)
+}

-    return {
-        current,
-        isLoading,
-        setCurrent,
-        clearCurrent,
-        loadReception: load,
-        createReception: create,
-        updateReception: update
+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
    }
+  }
 })
--- a/frontend/stores/shipment.ts
+++ b/frontend/stores/shipment.ts
@@ -1,19 +1,58 @@
 import { defineStore } from 'pinia'
-import { useWorkflowStoreLogic } from '~/stores/workflow-store'
-import { shipmentService } from '~/services/shipment'
-import type { ShipmentData, ShipmentPayload } from '~/services/dto/shipment-data'
+import type {ShipmentData, ShipmentPayload} from "~/services/dto/shipment-data";
+import {createShipment, getShipment, updateShipment} from "~/services/shipment";

-export const useShipmentStore = defineStore('shipment', () => {
-    const { current, isLoading, setCurrent, clearCurrent, load, create, update } =
-        useWorkflowStoreLogic<ShipmentData, ShipmentPayload>(shipmentService)
+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
+            }

-    return {
-        current,
-        isLoading,
-        setCurrent,
-        clearCurrent,
-        loadShipment: load,
-        createShipment: create,
-        updateShipment: update
+            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
+        }
    }
 })
--- a/frontend/stores/workflow-store.ts
+++ b/frontend/stores/workflow-store.ts
@@ -1,59 +0,0 @@
-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 }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
kevin	32fe51caaa	feat : creation du composant datatable (WIP)	2026-02-18 14:54:18 +01:00
kevin	c229d0ab62	Merge branch 'refs/heads/develop' into feat/266-creation-composant-datatable	2026-02-18 08:05:12 +01:00
kevin	74de31721c	feat : creation du composant datatable (WIP)	2026-02-17 14:52:23 +01:00
kevin	850e412840	Merge branch 'develop' into feat/266-creation-composant-datatable	2026-02-17 08:20:23 +01:00
kevin	dc69673a05	Merge branch 'develop' into feat/266-creation-composant-datatable # Conflicts: # frontend/pages/reception/finish-reception.vue # frontend/pages/shipment/finish-shipment.vue	2026-02-17 08:11:41 +01:00
kevin	316a20c43a	feat : creation du composant datatable (WIP)	2026-02-16 16:05:04 +01:00
kevin	d16a81630c	Merge branch 'develop' into feat/266-creation-composant-datatable	2026-02-16 08:06:02 +01:00
kevin	d8c0a8b8e3	feat : creation du composant datatable (WIP)	2026-02-13 16:06:55 +01:00