chore: bump version to v0.0.64

[#355 ] modification front de la page admin transporteur (!36 )
| Numéro du ticket | Titre du ticket | |------------------|-----------------| | #355 | modification front de la page admin transporteur | ## Description de la PR ## Modification du .env ## Check list - [x] Pas de régression - [ ] TU/TI/TF rédigée - [x] TU/TI/TF OK - [x] CHANGELOG modifié Reviewed-on: #36 Reviewed-by: Autin <tristan@yuno.malio.fr> Co-authored-by: sroy <sebastien@yuno.malio.fr> Co-committed-by: sroy <sebastien@yuno.malio.fr>
2026-02-27 10:06:55 +00:00 · 2026-02-27 10:06:49 +00:00 · 2026-02-27 09:05:28 +00:00 · 2026-02-27 09:05:22 +00:00 · 2026-02-26 14:01:46 +00:00 · 2026-02-26 14:01:39 +00:00
108 changed files with 6588 additions and 1802 deletions
--- a/.idea/data_source_mapping.xml
+++ b/.idea/data_source_mapping.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourcePerFileMappings">
-    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
-    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_1.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
-    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_2.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
-    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_3.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
-    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_4.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
-  </component>
-</project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,28 +4,10 @@
    <option name="autoReloadType" value="SELECTIVE" />
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
-      <change afterPath="$PROJECT_DIR$/frontend/components/shipment/shipment-form.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/frontend/pages/shipment/[[id]].vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/frontend/services/bovin-shipment.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/frontend/services/customer.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/frontend/services/dto/bovin-shipment-data.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/frontend/services/dto/customer-data.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/frontend/services/dto/shipment-data.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/frontend/services/dto/shipment-type-data.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/frontend/services/shipment-type.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/frontend/services/shipment.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/frontend/stores/shipment.ts" afterDir="false" />
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : front page admin bovin et changelog">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/components/ui/UiNumberInput.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/ui/UiNumberInput.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/constants/steps.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/constants/steps.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/i18n/locales/fr.json" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/i18n/locales/fr.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/pages/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/services/reception.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/reception.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Entity/Address.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Address.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Entity/BovinShipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/BovinShipment.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Entity/Shipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Shipment.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -48,19 +30,23 @@
  <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="fix/makefile" />
+        <entry key="$PROJECT_DIR$" value="feat/356-front-page-admin-bovin" />
      </map>
    </option>
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" root0="FORCE_HIGHLIGHTING" />
+  </component>
  <component name="McpProjectServerCommands">
    <commands />
    <urls />
@@ -244,14 +230,14 @@
    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
    "RunOnceActivity.git.unshallow": "true",
    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
-    "git-widget-placeholder": "feat/271-expedition-etape-1",
-    "last_opened_file_path": "/home/sroy/Documents/test/Ferme",
+    "git-widget-placeholder": "feat/352-modification-front-admin-fournisseur",
+    "last_opened_file_path": "/home/sroy/Documents/test/Ferme/frontend/components/commun",
    "node.js.detected.package.eslint": "true",
    "node.js.detected.package.tslint": "true",
    "node.js.selected.package.eslint": "(autodetect)",
    "node.js.selected.package.tslint": "(autodetect)",
    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "configurable.tailwindcss",
+    "settings.editor.selected.configurable": "preferences.pluginManager",
    "ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
    "vue.rearranger.settings.migration": "true"
  },
@@ -268,6 +254,13 @@
  }
 }]]></component>
  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/frontend/components/commun" />
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
+      <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="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\templates" />
@@ -313,158 +306,10 @@
      <workItem from="1770195718952" duration="215000" />
      <workItem from="1770195959162" duration="18915000" />
      <workItem from="1770274844804" duration="3940000" />
-    </task>
-    <task id="LOCAL-00001" summary="feat : Ajout de pinia, création de la table weight et reception mise en place du système de step pour les receptions (WIP)">
-      <option name="closed" value="true" />
-      <created>1768237763998</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1768237763998</updated>
-    </task>
-    <task id="LOCAL-00002" summary="feat : Ajout de zod, création d'un composant de chargement loading-dots.vue et finalisation du flow d'une reception">
-      <option name="closed" value="true" />
-      <created>1768316052474</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1768316052474</updated>
-    </task>
-    <task id="LOCAL-00003" summary="feat : Ajout d'un composable pour la pesée qui sera réutilisable pour l'expédition, ajout de contrainte sur les entity de reception et weight pour plus de robustesse et correction de la class active des liens dans la nav">
-      <option name="closed" value="true" />
-      <created>1768316835575</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1768316835575</updated>
-    </task>
-    <task id="LOCAL-00004" summary="feat : update du fichier AGENTS.md">
-      <option name="closed" value="true" />
-      <created>1768316965511</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1768316965511</updated>
-    </task>
-    <task id="LOCAL-00005" summary="feat : update du fichier README.md et CHANGELOG.md">
-      <option name="closed" value="true" />
-      <created>1768317786187</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1768317786187</updated>
-    </task>
-    <task id="LOCAL-00006" summary="fix : correction du useApi pour qu'il n'y ait plus de retry lors d'une erreur 500 par exemple">
-      <option name="closed" value="true" />
-      <created>1768318875533</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1768318875533</updated>
-    </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>
+      <workItem from="1770798536017" duration="20774000" />
+      <workItem from="1770879701502" duration="25805000" />
+      <workItem from="1770966186589" duration="914000" />
+      <workItem from="1770967274060" duration="2388000" />
    </task>
    <task id="LOCAL-00020" summary="ci : fix release artefact">
      <option name="closed" value="true" />
@@ -706,7 +551,159 @@
      <option name="project" value="LOCAL" />
      <updated>1770217875423</updated>
    </task>
-    <option name="localTasksCounter" value="50" />
+    <task id="LOCAL-00050" summary="feat : creer une nouvelle expedtion (WIP)">
+      <option name="closed" value="true" />
+      <created>1770736570645</created>
+      <option name="number" value="00050" />
+      <option name="presentableId" value="LOCAL-00050" />
+      <option name="project" value="LOCAL" />
+      <updated>1770736570645</updated>
+    </task>
+    <task id="LOCAL-00051" summary="feat : ajout d'une page de creation d'une expedition">
+      <option name="closed" value="true" />
+      <created>1770880791564</created>
+      <option name="number" value="00051" />
+      <option name="presentableId" value="LOCAL-00051" />
+      <option name="project" value="LOCAL" />
+      <updated>1770880791565</updated>
+    </task>
+    <task id="LOCAL-00052" summary="feat : changelog">
+      <option name="closed" value="true" />
+      <created>1770881437439</created>
+      <option name="number" value="00052" />
+      <option name="presentableId" value="LOCAL-00052" />
+      <option name="project" value="LOCAL" />
+      <updated>1770881437439</updated>
+    </task>
+    <task id="LOCAL-00053" summary="feat : lister les expeditions terminees">
+      <option name="closed" value="true" />
+      <created>1770883114609</created>
+      <option name="number" value="00053" />
+      <option name="presentableId" value="LOCAL-00053" />
+      <option name="project" value="LOCAL" />
+      <updated>1770883114609</updated>
+    </task>
+    <task id="LOCAL-00054" summary="feat : lister les expeditions terminees">
+      <option name="closed" value="true" />
+      <created>1770884154297</created>
+      <option name="number" value="00054" />
+      <option name="presentableId" value="LOCAL-00054" />
+      <option name="project" value="LOCAL" />
+      <updated>1770884154297</updated>
+    </task>
+    <task id="LOCAL-00055" summary="fix : corrections diverses">
+      <option name="closed" value="true" />
+      <created>1770969471135</created>
+      <option name="number" value="00055" />
+      <option name="presentableId" value="LOCAL-00055" />
+      <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>
+    <option name="localTasksCounter" value="69" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -756,22 +753,6 @@
    </option>
  </component>
  <component name="VcsManagerConfiguration">
-    <MESSAGE value="fix : correction du path URI pour la création d'un poids dans une réception" />
-    <MESSAGE value="feat : Ajout du bundle Monolog pour la gestion des logs" />
-    <MESSAGE value="fix : affiche plus détail dans les logs en recette/prod" />
-    <MESSAGE value="fix : modification du script de déploiement pour corriger le problème d'écriture des logs de prod" />
-    <MESSAGE value="fix : doc de déploiement" />
-    <MESSAGE value="fix : doc et script de déploiement" />
-    <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" />
@@ -781,7 +762,23 @@
    <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)" />
-    <option name="LAST_COMMIT_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" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat : front page admin bovin et changelog" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
@@ -791,10 +788,15 @@
          <line>6</line>
          <option name="timeStamp" value="3" />
        </line-breakpoint>
+        <line-breakpoint enabled="true" type="php">
+          <url>file://$PROJECT_DIR$/src/Entity/Shipment.php</url>
+          <line>6</line>
+          <option name="timeStamp" value="45" />
+        </line-breakpoint>
        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/frontend/services/shipment.ts</url>
-          <properties lambdaOrdinal="-1" />
-          <option name="timeStamp" value="37" />
+          <url>file://$PROJECT_DIR$/frontend/layouts/default.vue</url>
+          <line>72</line>
+          <option name="timeStamp" value="48" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -8,6 +8,7 @@ Project overview
 Backend conventions
 - Use English for code identifiers/messages; keep “pont-bascule” as domain term.
 - API Platform operations are defined on Doctrine entities.
+- No custom repository classes are used (`src/Repository` removed); use default Doctrine repositories via `EntityManagerInterface`.
 - 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`).
@@ -17,6 +18,13 @@ Backend conventions
 - 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.
+- Bovine storage:
+  - `src/Entity/Bovine.php` with fields `nationalNumber` (unique), `receivedWeight`, `arrivalDate`, and `buildingCase` (ManyToOne).
+  - `src/Entity/BuildingCase.php` has `bovines` (OneToMany).
+- Case PDF report:
+  - Endpoint: `GET /building_cases/{id}/weights-report` (provider: `App\State\BuildingCaseWeightsReportProvider`).
+  - Template: `templates/case_weights_report.html.twig`.
+  - Projection logic is done in backend from `arrivalDate`; daily gain is currently fixed at `1.3 kg/day` for all races.

 Frontend conventions
 - Nuxt SSR disabled; Tailwind used.
@@ -36,6 +44,7 @@ Frontend conventions
 - 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`.
+- Infrastructure case page prints the case weight report PDF from `frontend/pages/infrastructure/case.vue` using `usePdfPrinter('/building_cases/{id}/weights-report')`.

 Environment & routing
 - Frontend dev server: `npm run dev` in `frontend/`.
@@ -47,6 +56,11 @@ Environment & routing
 Notes
 - Do not add a GET that creates resources; use POST + PATCH.
 - Keep endpoints in plural (API Platform convention).
+- Seed and fixtures conventions:
+  - `app:seed` now seeds infrastructure (`statut`, `building_layout`, `building_case`, `building_case_position`) and bovines.
+  - `app:seed` uses intermediate flushes (after buildings and after infrastructure) so find queries can resolve just-created records.
+  - Bovine seed rows use a legacy case token mapping to building-case code (`B{building}-C{case}`) before fallback to direct id lookup.
+  - Fixtures include `BuildingInfrastructureFixtures` + `BovineFixtures` (via `AppFixtures` dependencies).
 - 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`).
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,7 +44,19 @@ Ajouter dans le fichier .env du frontend
 * [#275] Lister les expéditions en attente
 * [#276] Lister les expéditions terminées
 * [#324] Creation page admin listing clients
-
+* [#326] Admin modification creation client
+* [#325] Correction diverses
+* 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] afficher/modifier écran expédition terminée
 ### Changed

 ### Fixed
+
--- a/config/version.yaml
+++ b/config/version.yaml
@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.42'
+    app.version: '0.0.64'
--- a/frontend/components/address.vue
+++ b/frontend/components/address.vue
@@ -1,34 +1,36 @@
 <template>
    <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 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"/>
            </div>
-
-            <button
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-                type="submit"
-                :disabled="isLoading"
-            >
-                {{ props.address? "Sauvegarder" : "Ajouter" }}
-            </button>
+            <h1 class="text-3xl text-primary-500 font-bold uppercase">
+                {{ props.address ? "Modification d'une adresse" : "Ajout d'une adresse" }}
+            </h1>
        </div>

-        <div class="grid grid-cols-2 gap-y-16 gap-x-12 mb-16 mt-10">
+        <div class="grid grid-cols-2 gap-y-16 gap-x-[200px] mb-16">
            <UiTextInput id="address-label" v-model="form.label" label="Libellé" />
            <UiTextInput id="address-street" v-model="form.street" label="Rue" />
            <UiTextInput id="address-street2" v-model="form.street2" label="Complément" />
            <UiTextInput id="address-postalCode" v-model="form.postalCode" label="Code postal" />
            <UiTextInput id="address-city" v-model="form.city" label="Ville" />
-            <UiTextInput id="address-country" v-model="form.countryCode" label="Pays" />
+            <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"
+        >
+            Valider
+        </UiButton>
        </div>
    </form>
 </template>

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


 const route = useRoute()
@@ -52,6 +54,20 @@ const emptyForm = (): AddressPayload => ({

 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 ?? ""
@@ -75,6 +91,10 @@ const validateForm = () => {
    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,22 +2,22 @@

 <template>
    <NuxtLink :to="link">
-        <div class="w-[324px] h-[228px] border border-black rounded-md p-6 flex flex-col justify-between">
+        <div class="w-[300px] h-[216px] border border-primary-700 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-neutral-400 flex justify-center items-center">
-                    <Icon :name="iconName" style="color: black" size="44" />
+                <div class="rounded-full w-[80px] h-[80px] bg-[#D9D9D9] flex justify-center items-center">
+                    <Icon :name="iconName" class="!text-primary-700" size="44" />
                </div>
                <div>
                    <Icon name="mdi:plus" style="color: black" size="44"  />
                </div>
            </div>
            <div class="uppercase font-bold">
-                <p class="text-3xl"> {{ label }} </p>
+                <p class="text-3xl text-primary-700">
+                    <slot name="label">{{ label }}</slot>
+                </p>
            </div>
        </div>
        </NuxtLink>
-
-
 </template>

 <script setup lang="ts">
@@ -27,4 +27,3 @@ const props = defineProps<{
    label: string
 }>()
 </script>
-
--- a/frontend/components/commun/update-weight.vue
+++ b/frontend/components/commun/update-weight.vue
@@ -0,0 +1,63 @@
+<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"
+                :max="48000"
+                wrapper-class="flex-col"
+            />
+
+            <UiDateInput
+                label="Date de pesée"
+                v-model="localWeight.weighedAt"
+                :disabled="!isAdmin"
+            />
+
+            <UiNumberInput
+                label="Dsd"
+                class="col-start-2"
+                labelClass="font-bold uppercase"
+                v-model="localWeight.dsd"
+                :disabled="!isAdmin"
+                wrapper-class="flex-col"
+            />
+        </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,21 +1,24 @@
 <template>
    <div
        v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"
-        class="flex flex-col items-center gap-16">
-        <h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
+        class="flex flex-col 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">
+            class="flex flex-row gap-8 items-center w-full">
            <div
                v-for="type in bovineType"
                :key="type.id"
-                class="mt-8 flex flex-row mb-2 gap-6">
+                class="mt-8 flex flex-row mb-2 w-full">
                <UiNumberInput
+                    :id="type.id"
                    :label="type.label"
                    :code="type.code"
                    v-model="bovineQuantities[String(type.id)]"
                    :placeholder="0"
                    :min="0"
                    :max="10"
+                    class="max-w-[150px]"
+                    wrapper-class="gap-3"
                />
            </div>
            <div
@@ -23,14 +26,19 @@
                <UiNumberInput
                    label="Autres"
                    v-model="otherQuantity"
+                    class="max-w-[80px]"
+                    wrapper-class="gap-3"
                />
            </div>
        </div>
-        <button
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            @click="goNext"
-        >Peser
-        </button>
+        <div class="flex justify-center">
+            <UiButton
+                type="submit"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
+                @click="goNext"
+            >Valider
+            </UiButton>
+        </div>
    </div>
 </template>
 <script setup lang="ts">
@@ -77,14 +85,14 @@ onMounted(async () => {
 })

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

        const selectionMap: Record<string, number | null> = {}
-        for (const type of bovineType.value) {
+        for (const type of types) {
            selectionMap[String(type.id)] = 0
        }

--- a/frontend/components/reception/reception-form.vue
+++ b/frontend/components/reception/reception-form.vue
@@ -1,7 +1,7 @@
 <template>
    <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">Réception</h1>
+            <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"
@@ -81,20 +81,8 @@
                select-class="h-[34px]"
                wrapper-class="col-start-2 row-start-3"
            />
-            <!--    Chauffeur (LIOT)        -->
-            <UiSelect
-                id="reception-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="col-start-2 row-start-4"
-            />
            <!--    Plaque d'immatriculation       -->
-            <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
+            <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
                <UiLicensePlateInput
                    v-model="form.licensePlate"
                    v-model:allowAny="allowAnyLicensePlate"
@@ -112,15 +100,28 @@
                }))"
                :loading="isLoadingVehicles"
                :disabled="isLoadingVehicles || filteredVehicles.length === 0"
+                wrapper-class="col-start-2 row-start-4 h-[64px]"
+            />
+            <!--    Chauffeur (LIOT)        -->
+            <UiSelect
+                id="reception-driver"
+                v-model="form.driverId"
+                label="Nom du chauffeur si LIOT"
+                :options="filteredDrivers.map((driver) => ({
+                    value: String(driver.id),
+                    label: driver.name
+                }))"
+                :loading="isLoadingDrivers"
+                v-if="isLiotCarrier"
                wrapper-class="col-start-2 row-start-5"
            />
        </div>
        <div class="flex justify-center">
-            <button
+            <UiButton
                type="submit"
                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
-            >Peser
-            </button>
+            >Valider
+            </UiButton>
        </div>
    </form>

@@ -342,7 +343,7 @@ onMounted(async () => {

 // Ajuste driver/vehicle quand le transporteur change (logique LIOT)
 watch(
-    () => [form.supplierId, suppliers.value],
+    () => [form.supplierId, form.addressId, suppliers.value],
    () => {
        if (!form.supplierId) {
            form.addressId = ''
@@ -359,7 +360,11 @@ watch(
            (address) => String(address.id) === form.addressId
        )
        if (!matches) {
-            form.addressId = ''
+            if (supplierAddresses.value.length === 1) {
+                form.addressId = String(supplierAddresses.value[0].id)
+            } else {
+                form.addressId = ''
+            }
        }
    },
    {immediate: true}
--- a/frontend/components/reception/reception-product-received.vue
+++ b/frontend/components/reception/reception-product-received.vue
@@ -3,7 +3,7 @@
        <div
            v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
            class="flex flex-col gap-16 items-center w-full">
-            <h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
+            <h1 class="text-4xl uppercase font-bold text-primary-500">Sélection des marchandises réceptionnnées</h1>
            <UiSelect
                id="merchandise-type"
                v-model="selectedMerchandiseTypeId"
@@ -26,7 +26,7 @@

            <div
                v-if="selectedMerchandiseTypeId && !isGranule"
-                class="flex gap-4 w-[550px] justify-evenly"
+                class="flex gap-4 w-[550px] justify-between"
            >
                <div
                    v-for="building in buildings"
@@ -47,28 +47,31 @@
            >
                <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>
+                        <p class="font-bold uppercase text-primary-500">{{ type.label }}</p>
                        <div
                            v-for="building in buildings"
                            :key="building.id"
-                            class="flex items-center gap-2 text-lg"
+                            class="flex items-center gap-2 text-lg pl-[2px]"
                        >
                            <UiCheckbox
                                v-model="selectedPelletBuildingIds[String(type.id)]"
                                :value="String(building.id)"
                                :label="building.label"
-                                label-class="text-lg"
+                                label-class="text-xl"
                            />
                        </div>
                    </div>
                </div>
            </div>
        </div>
-        <button
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            @click="goNext"
-        >Peser
-        </button>
+        <div class="flex justify-center">
+            <UiButton
+                type="submit"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
+                @click="goNext"
+            >Valider
+            </UiButton>
+        </div>
    </div>
 </template>

--- a/frontend/components/reception/reception-weight.vue
+++ b/frontend/components/reception/reception-weight.vue
@@ -1,9 +1,9 @@
 <template>
    <div class="flex justify-center">
        <div class="flex flex-col items-center w-[660px]">
-            <h1 class="font-bold text-5xl uppercase">{{ title }}</h1>
+            <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>
+            <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]">
@@ -11,32 +11,32 @@
            </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">
+                    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]">
-        <button
+        <UiButton
            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
            @click="fetchWeight"
-        >{{ displayWeight !== null ? 'refaire une pesee' : 'peser' }}</button>
-        <button
+        >{{ 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</button>
-        <button
+        >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</button>
+        >Générer le bon</UiButton>
    </div>
 </template>

 <script setup lang="ts">
-import { computed } from 'vue'
+import {computed, onMounted} from 'vue'
 import { storeToRefs } from 'pinia'
 import { useWeighing } from '~/composables/useWeighing'
 import { usePdfPrinter } from '~/composables/usePdfPrinter'
@@ -94,7 +94,7 @@ const printReceipt = async () => {

 // Récupère le poids dès l'arrivée sur l'écran
 onMounted(() => {
-    if (false === displayWeight.value) {
+    if (displayWeight.value === null) {
        fetchWeight()
    }
 })
--- a/frontend/components/reception/update-bovin.vue
+++ b/frontend/components/reception/update-bovin.vue
@@ -1,183 +1,161 @@
 <template>
-    <form @submit.prevent="validate">
-    <div
-        class="flex flex-col items-center gap-16">
-        <div
-            class="flex flex-row gap-6 items-center">
+    <form>
+        <div class="flex flex-row justify-between gap-x-12 font-bold uppercase mb-8">
            <div
-                v-for="type in bovineType"
+                v-for="type in bovineTypes"
                :key="type.id"
-                class="flex flex-row mb-2 gap-6 ">
+            >
                <UiNumberInput
                    :label="type.label"
                    :code="type.code"
-                    v-model="bovineQuantities[String(type.id)]"
-                    :disabled="!auth.isAdmin"
+                    v-model="localQuantities[String(type.id)]"
+                    :disabled="!isAdmin"
                    :placeholder="0"
                    :min="0"
                    :max="10"
+                    wrapperClass="w-44 flex-col"
+                    inputClass="font-medium"
                />
            </div>
-            <div
-                class=" flex flex-row mb-2 gap-6">
-                <UiNumberInput
-                    label="Autres"
-                    v-model="otherQuantity"
-                    :disabled="!auth.isAdmin"
-                />
-            </div>
+            <UiNumberInput
+                label="Autres"
+                v-model="localOtherQuantity"
+                :disabled="!isAdmin"
+                wrapperClass="w-44 flex-col"
+                inputClass="font-medium"
+            />
        </div>
-        <button
-            type="submit"
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            :disabled="!auth.isAdmin"
-        >Valider
-        </button>
-    </div>
    </form>
 </template>
+
 <script setup lang="ts">
-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()
+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'
+
 const props = defineProps<{
-    idReception: number
+    modelValue: ReceptionBovineTypeData[]
+    otherQuantity: number | null
+    isAdmin: boolean
 }>()
-const receptionId = props.idReception
-const reception = await getReception(receptionId)

-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 emit = defineEmits<{
+    (event: 'update:modelValue', value: ReceptionBovineTypeData[]): void
+    (event: 'update:otherQuantity', value: number | null): void
+}>()

-const loadBovineType = async () => {
-    isLoadingBovineType.value = true
+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
    try {
-        bovineType.value = await getBovineTypeList()
+        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
+        }
    } finally {
-        isLoadingBovineType.value = false
+        isSyncing.value = false
    }
 }

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

-        const selectionMap: Record<string, number | null> = {}
-        for (const type of bovineType.value) {
-            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 = await reception.bovineDetail
-        const parsedOther =
-            typeof existingOther === 'string' && existingOther.trim() !== ''
-                ? Number(existingOther)
-                : 0
-        otherQuantity.value = Number.isFinite(parsedOther) ? parsedOther : 0
-    },
-    {immediate: true}
+        const next = value ?? 0
+        isSyncing.value = true
+        localOtherQuantity.value = next
+        isSyncing.value = false
+    }
 )

-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.')
-        })
+watch(localOtherQuantity, (value) => {
+    if (isSyncing.value) {
        return
    }

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

-    await updateReception(receptionId, {
-        merchandiseType: null,
-        merchandiseDetail: null,
-        bovineDetail: otherQuantity.value ? String(otherQuantity.value) : null,
-    })
-}
+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()
+})
 </script>
--- a/frontend/components/reception/update-merchandise.vue
+++ b/frontend/components/reception/update-merchandise.vue
@@ -1,65 +1,76 @@
 <template>
-    <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"
-                :value="reception.merchandiseType?.label"
-                wrapper-class="w-[550px]"
-                :disabled="true"
-            />
-            <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"
+    <form>
+        <div class="flex flex-col">
+            <div class="w-full col-start-1 row-start-1">
+                <UiRadioGroup
+                    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-[336px_336px_355px_200px] w-[160px_160px_200px_180px] mt-9 mb-7"
+                    :disabled="!isAdmin"
                />
            </div>

-            <div
-                v-if="merchandiseTypeId && !isGranule"
-                class="flex gap-4 w-[550px] justify-evenly"
-            >
+            <div class="w-full grid grid-cols-[3fr_1fr] gap-12 col-start-2 row-start-1">
                <div
-                    v-for="building in buildings"
-                    :key="building.id"
+                    v-if="selectedMerchandiseTypeId && !isGranule"
+                    class="flex gap-[218px]"
                >
-                    <UiCheckbox
-                        v-model="selectedBuildingIds"
-                        :value="String(building.id)"
-                        :label="building.label"
-                        :disabled="!auth.isAdmin"
-                        label-class="text-xl"
+                    <div
+                        v-for="building in buildings"
+                        :key="building.id"
+                    >
+                        <UiCheckbox
+                            v-model="selectedBuildingIds"
+                            :value="String(building.id)"
+                            :label="building.label"
+                            :disabled="!isAdmin"
+                            input-class="accent-primary-700 focus:ring-primary-700"
+                            label-class="text-xl uppercase"
+                        />
+                    </div>
+                </div>
+
+                <div
+                    v-if="selectedMerchandiseTypeId && isAutres"
+                    class="flex flex-col justify-self-end max-w-[182px]"
+                >
+                    <UiTextInput
+                        id="merchandise-detail"
+                        :disabled="!isAdmin"
+                        v-model="merchandiseDetail"
+                        placeholder="Préciser"
+                        :maxlength="255"
+                        class="h-6"
                    />
                </div>
            </div>

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

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

 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('')
-const auth = useAuthStore()
-const props = defineProps<{
-    idReception: number
-}>()
-const receptionId = props.idReception
-const reception = await getReception(receptionId)
-const merchandiseTypeId = await reception.receptionType?.id
+// Verrou de synchro pour empêcher les aller-retours infinis entre parent et composant.
+const isSyncing = ref(false)
+const isReady = ref(false)

-// Extrait l'ID d'une relation depuis un IRI ou un objet complet.
-const getRelationId = (value: unknown): string | null => {
-    if (!value) {
-        return null
+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]
    }
-
-    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
+    return clone
 }

-// Type de marchandise sélectionné dans le select
-const selectedMerchandiseType = computed(() =>
-    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)
+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 }
+)

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

-    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
+    hydrateFromModelValue(props.modelValue)
+    isReady.value = true
 })
-// 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
@@ -1,74 +0,0 @@
-<template>
-    <form @submit.prevent="validate">
-
-        <div class="grid grid-cols-2 gap-x-40 gap-y-8 mb-16">
-            <UiNumberInput
-                label="Pesée à vide"
-                v-model="form.weights[0].weight"
-                :disabled="!auth.isAdmin"
-                :min="0"
-            />
-
-            <UiNumberInput
-                label="Pesée à plein"
-                v-model="form.weights[1].weight"
-                :disabled="!auth.isAdmin"
-                :min="0"
-            />
-        </div>
-
-        <div class="flex justify-center">
-            <button
-                type="submit"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-                :disabled="!auth.isAdmin"
-            >
-                Valider
-            </button>
-        </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 },
-        { id: 0, type: 'gross' as const, weight: 0 }
-    ]
-})
-
-const hydrateFromReception = (reception: ReceptionFormWeight) => {
-    const tare = reception.weights.find(weight => weight.type === 'tare')
-    const gross = reception.weights.find(weight => weight.type === 'gross')
-
-    if (tare) form.weights[0] = { ...tare }
-    if (gross) form.weights[1] = { ...gross }
-}
-
-onMounted(async () => {
-    const reception = await getReception(idReception)
-    hydrateFromReception(reception)
-})
-
-async function validate() {
-
-    for (const weight of form.weights) {
-        if (weight.id) {
-            await updateWeight(weight.id, {weight: weight.weight})
-        }
-    }
-}
-</script>
--- a/frontend/components/shipment/shipment-form.vue
+++ b/frontend/components/shipment/shipment-form.vue
@@ -1,7 +1,7 @@
 <template>
    <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">Expédition</h1>
+        <div class="grid grid-cols-2 h-[461px] items-start gap-y-8 gap-x-40 mb-16">
+            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1 text-primary-500">Expédition</h1>
            <!--    Nom de l'utilisateur       -->
            <UiSelect
                id="shipment-user"
@@ -22,24 +22,29 @@
                wrapper-class="col-start-1 row-start-3"
            />
            <!--    Type d'expédition        -->
-            <div class="col-start-1 row-start-4">
-                <label class="font-bold uppercase text-xl mb-2 block">
-                    Type d'expédition
-                </label>
-                <div class="grid grid-cols-2 gap-x-8">
-                    <div
-                        v-for="type in bovineShipment"
-                        :key="type.id"
-                        class="mt-8 flex flex-row gap-6"
-                    >
-                        <UiNumberInput
-                            :label="type.label"
-                            v-model="bovineQuantities[String(type.id)]"
-                            :placeholder="0"
-                            :min="0"
-                            :max="10"
-                        />
-                    </div>
+            <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"
+                        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
+                        }))"
+                    />
+                    <UiNumberInput
+                        id="shipment-type-quantity"
+                        v-model="shipmentQuantity"
+                        :placeholder="0"
+                        :min="0"
+                        :max="1200"
+                        :disabled="!selectedShipmentTypeId"
+                    />
                </div>
            </div>
            <!--    Client        -->
@@ -49,7 +54,7 @@
                label="Client"
                :options="customers.map((customer) => ({
                    value: String(customer.id),
-                    label: customer.label
+                    label: customer.name || `Client #${customer.id}`
                }))"
                :loading="isLoadingCustomers"
                wrapper-class="col-start-1 row-start-5"
@@ -86,22 +91,10 @@
                }))"
                wrapper-class="col-start-2 row-start-3"
            />
-            <!--  Chauffeur (LIOT)        -->
-            <UiSelect
-                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"
-                wrapper-class="col-start-2 row-start-4"
-            />
            <!-- Plaque d'immatriculation (hors LIOT)        -->
-            <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
+            <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
                <UiLicensePlateInput
-                    v-model="form.licencePlate"
+                    v-model="form.licensePlate"
                    v-model:allowAny="allowAnyLicensePlate"
                />
            </div>
@@ -117,15 +110,28 @@
                }))"
                :loading="isLoadingVehicles"
                :disabled="isLoadingVehicles || filteredVehicles.length === 0"
+                wrapper-class="col-start-2 row-start-4"
+            />
+            <!--  Chauffeur (LIOT)        -->
+            <UiSelect
+                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"
                wrapper-class="col-start-2 row-start-5"
+                v-if="isLiotCarrier"
            />
        </div>
        <div class="flex justify-center">
-            <button
+            <UiButton
                type="submit"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
+                class="text-xl mb-16 uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
            >Valider
-            </button>
+            </UiButton>
        </div>
    </form>
 </template>
@@ -148,15 +154,9 @@ 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 {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[]>([])
@@ -177,8 +177,9 @@ const isLoadingDrivers = ref(false)
 const authStore = useAuthStore()
 const shipmentStore = useShipmentStore()
 const router = useRouter()
-const bovineQuantities = ref<Record<string, number | null>>({})
 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
@@ -194,7 +195,7 @@ const form = reactive<ShipmentFormData>({
    carrierId: '',
    driverId: '',
    vehicleId: '',
-    licencePlate: '',
+    licensePlate: '',
 })
 // Adresses liées au client sélectionné
 const customerAddresses = computed<AddressData[]>(() => {
@@ -316,7 +317,7 @@ watch(
    () => shipmentStore.current,
    (shipment) => {
        isHydrating.value = true
-        form.licencePlate = shipment?.licencePlate ?? ''
+        form.licensePlate = shipment?.licensePlate ?? ''
        form.shipmentDate = shipment?.shipmentDate ?? new Date().toISOString().slice(0, 10)
        form.userId = shipment?.user?.id ? String(shipment.user.id) :
            form.userId
@@ -327,24 +328,22 @@ watch(
        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) : ''
-        if (!shipment || !shipment.bovinShipments) {
-            bovineQuantities.value = {}
-        } else {
-            const next: Record<string, number | null> = {}
-            for (const entry of shipment.bovinShipments) {
-                const typeId = entry.shipmentType?.id
-                if (!typeId) continue
-                next[String(typeId)] = entry.nbBovinSend ?? null
-            }
-            bovineQuantities.value = next
-        }
+
+
+        selectedShipmentTypeId.value = shipment?.shipmentType?.id
+            ? String(shipment.shipmentType.id)
+            : ''
+
+        shipmentQuantity.value = shipment?.nbBovinSend ?? 0
+
+
        isHydrating.value = false
    },
    {immediate: true}
 )
 // Ajuste driver/vehicle quand le transporteur change (logique LIOT)
 watch(
-    () => [form.customerId, customers.value],
+    () => [form.customerId, form.addressId, customers.value],
    () => {
        if (!form.customerId) {
            form.addressId = ''
@@ -361,7 +360,11 @@ watch(
            (address) => String(address.id) === form.addressId
        )
        if (!matches) {
-            form.addressId = ''
+            if (customerAddresses.value.length === 1) {
+                form.addressId = String(customerAddresses.value[0].id)
+            } else {
+                form.addressId = ''
+            }
        }
    },
    {immediate: true}
@@ -440,83 +443,28 @@ watch(
            (vehicle) => String(vehicle.id) === form.vehicleId
        )
        if (selected) {
-            form.licencePlate = selected.plate
+            form.licensePlate = selected.plate
            allowAnyLicensePlate.value = false
        }
    }
 )
 watch(
-    () => [form.licencePlate, form.carrierId, vehicles.value],
+    () => [form.licensePlate, form.carrierId, form.vehicleId, vehicles.value],
    () => {
        if (!isLiotCarrier.value || form.vehicleId) {
            return
        }
        const match = filteredVehicles.value.find(
-            (vehicle) => vehicle.plate === form.licencePlate
+            (vehicle) => vehicle.plate === form.licensePlate
        )
        if (match) {
            form.vehicleId = String(match.id)
        }
    }
 )
-const buildDesiredBovinShipments = () => {
-    return bovineShipment.value
-        .map((type) => {
-            const raw = bovineQuantities.value[String(type.id)]
-            const quantity = raw === null || raw === undefined ? 0 : Number(raw)
-            return {
-                type,
-                quantity: Number.isFinite(quantity) ? Math.max(0, Math.trunc(quantity)) : 0
-            }
-        })
-        .filter((entry) => entry.quantity > 0)
-}
-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.licencePlate.trim()
+    const normalizedLicensePlate = form.licensePlate.trim()
    const normalizedShipmentDate = form.shipmentDate.trim()
    const normalizedCustomerId = form.customerId.trim()
    const normalizedTruckId = form.truckId.trim()
@@ -542,29 +490,36 @@ const buildPayload = () => {
    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

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

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

@@ -572,10 +527,6 @@ const saveDraft = async () => {
        currentStep: shipmentStore.current.currentStep,
        ...payload
    })
-    await syncBovinShipments(
-        shipmentStore.current.id,
-        shipmentStore.current?.bovinShipments ?? []
-    )
 }

 defineExpose({saveDraft})
@@ -589,7 +540,6 @@ const validate = async () => {
        })
        if (created) {
            await shipmentStore.loadShipment(created.id)
-            await syncBovinShipments(created.id, shipmentStore.current?.bovinShipments ?? [])
            await router.push(`/shipment/${created.id}`)
        }
        return
@@ -600,6 +550,5 @@ 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
@@ -0,0 +1,26 @@
+<template>
+    <div class="flex flex-col items-center gap-[118px]">
+        <h1 class="font-bold text-5xl uppercase text-primary-500">Chargement des bovins</h1>
+        <div
+            class="w-full flex flex-col items-center justify-center">
+            <UiLoadingDots />
+        </div>
+        <UiButton
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
+            @click="goNext"
+        >Peser</UiButton>
+    </div>
+</template>
+
+<script setup lang="ts">
+import {useShipmentStore} from "~/stores/shipment";
+
+const shipmentStore = useShipmentStore()
+
+const goNext = async () => {
+    const nextStep = shipmentStore.current.currentStep + 1
+    await shipmentStore.updateShipment(shipmentStore.current.id, {
+        currentStep: nextStep
+    })
+}
+</script>
--- a/frontend/components/shipment/shipment-weight.vue
+++ b/frontend/components/shipment/shipment-weight.vue
@@ -1,7 +1,7 @@
 <template>
    <div class="flex justify-center">
        <div class="flex flex-col items-center w-[660px]">
-            <h1 class="font-bold text-5xl uppercase">{{ title }}</h1>
+            <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
@@ -11,27 +11,27 @@
            </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">
+                    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]">
-        <button
+        <UiButton
            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
            @click="fetchWeight"
-        >{{ displayWeight !== null ? 'refaire une pesee' : 'peser' }}</button>
-        <button
+        >{{ 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</button>
-        <button
+        >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</button>
+        >Générer le bon</UiButton>
    </div>
 </template>

@@ -75,7 +75,7 @@ const printReceipt = async () => {

    await saveWeight()
    const shipment = shipmentStore.current
-    const filename = `${shipment.identificationNumber ?? shipment.id}_${shipment.customer?.label ?? 'client'}_${shipment.licencePlate ?? 'immat'}.pdf`
+    const filename = `${shipment.identificationNumber ?? shipment.id}_${shipment.customer?.label ?? 'client'}_${shipment.licensePlate ?? 'immat'}.pdf`
    await printPdf(`/shipments/${shipment.id}/receipt`, filename)

    // Laisse le temps a la boite de dialogue d'impression de s'ouvrir.
--- a/frontend/components/ui/UiButton.vue
+++ b/frontend/components/ui/UiButton.vue
@@ -0,0 +1,39 @@
+<template>
+    <component
+        :is="'button'"
+        :type="type"
+        :disabled="isDisabled"
+        class="inline-flex min-w-[194px] items-center justify-center rounded-md"
+        :class="[
+            isDisabled ? 'cursor-not-allowed opacity-60' : 'cursor-pointer',
+            buttonClass
+        ]"
+        v-bind="attrs"
+    >
+        <slot v-if="!loading" />
+        <UiLoadingDots v-else />
+    </component>
+</template>
+
+<script setup lang="ts">
+import {computed, useAttrs} from 'vue'
+
+defineOptions({inheritAttrs: false})
+
+const props = withDefaults(
+    defineProps<{
+        type?: 'button' | 'submit' | 'reset'
+        disabled?: boolean
+        loading?: boolean
+        buttonClass?: string
+    }>(),
+    {
+        disabled: false,
+        loading: false,
+        buttonClass: ''
+    }
+)
+
+const attrs = useAttrs()
+const isDisabled = computed(() => props.disabled || props.loading)
+</script>
--- 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"
+            class="flex items-center gap-2 cursor-pointer text-primary-700"
            :class="labelClass"
        >
            <input
                type="checkbox"
                :checked="checked"
                :disabled="disabled"
-                :class="inputClass"
+                :class="['h-4 w-4 cursor-pointer text-primary-500', inputClass]"
                @change="onChange"
            >
            <span v-if="label">{{ label }}</span>
--- 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 mb-2"
+            class="font-bold uppercase text-xl text-primary-700"
            :class="labelClass"
        >
            {{ label }}
@@ -14,9 +14,9 @@
            :value="modelValue ?? ''"
            :disabled="disabled"
            v-bind="attrs"
-            class="border-b border-black justify-self-start text-xl pb-[6px] uppercase bg-transparent appearance-none h-[34px]"
+            class="border-b border-primary-700 justify-self-start text-xl text-primary-700 py-[6px] uppercase bg-transparent appearance-none h-[34px]"
            :class="[
-                isEmpty ? 'text-neutral-400' : 'text-black',
+                isEmpty ? 'text-neutral-400' : 'text-primary-700',
                disabled ? 'cursor-not-allowed' : 'cursor-pointer',
                inputClass
            ]"
--- a/frontend/components/ui/UiNumberInput.vue
+++ b/frontend/components/ui/UiNumberInput.vue
@@ -1,9 +1,10 @@
+// flex row passer en class wraper class flex col ainsi que le wfull 34
 <template>
-    <div :class="['flex flex-row items-center gap-2', wrapperClass]">
+    <div :class="['flex', wrapperClass]">
        <label
            v-if="label"
            :for="id"
-            class="text-xl text-bold flex items-center"
+            class="text-xl flex items-center gap-2 text-primary-700"
            :class="labelClass"
        >
            <span
@@ -25,7 +26,7 @@
            :step="step"
            :disabled="disabled"
            v-bind="attrs"
-            class="border-b border-black text-xl bg-transparent w-12"
+            class="border-b border-primary-700 justify-self-start text-xl text-primary-700 py-[6px] uppercase bg-transparent appearance-none h-[34px]"
            :class="[
                isEmpty ? 'text-neutral-400' : 'text-black',
                disabled ? 'cursor-not-allowed' : 'cursor-text',
@@ -74,14 +75,41 @@ const emit = defineEmits<{
 const attrs = useAttrs()
 const isEmpty = computed(() => props.modelValue === null || props.modelValue === undefined || props.modelValue === '')

+const toNumberOrNull = (value: number | string | undefined) => {
+    if (value === undefined || value === '') {
+        return null
+    }
+    const parsed = Number(value)
+    return Number.isFinite(parsed) ? parsed : null
+}
+
 const onInput = (event: Event) => {
    const target = event.target as HTMLInputElement
    if (target.value === '') {
        emit('update:modelValue', null)
        return
    }
-    const numeric = Math.max(0, Number(target.value))
-    emit('update:modelValue', Number.isNaN(numeric) ? null : numeric)
+    const parsed = Number(target.value)
+    if (!Number.isFinite(parsed)) {
+        emit('update:modelValue', null)
+        return
+    }
+
+    const min = toNumberOrNull(props.min)
+    const max = toNumberOrNull(props.max)
+
+    let numeric = parsed
+    if (min !== null) {
+        numeric = Math.max(min, numeric)
+    } else {
+        numeric = Math.max(0, numeric)
+    }
+    if (max !== null) {
+        numeric = Math.min(max, numeric)
+    }
+
+    target.value = String(numeric)
+    emit('update:modelValue', numeric)
 }

 const onKeydown = (event: KeyboardEvent) => {
--- a/frontend/components/ui/UiRadioGroup.vue
+++ b/frontend/components/ui/UiRadioGroup.vue
@@ -0,0 +1,93 @@
+<template>
+    <div :class="['flex flex-col', wrapperClass]">
+        <label
+            v-if="label"
+            class="font-bold uppercase text-xl text-primary-700"
+            :class="labelClass"
+        >
+            {{ label }}
+        </label>
+        <div
+            role="radiogroup"
+            :aria-label="label || id || 'radio-group'"
+            :class="['flex items-center gap-6 mt-1', groupClass]"
+        >
+            <label
+                v-for="option in options"
+                :key="String(option.value)"
+                :for="`${id || 'radio'}-${option.value}`"
+                class="flex items-center gap-2 text-primary-700"
+                :class="itemClass"
+            >
+                <input
+                    :id="`${id || 'radio'}-${option.value}`"
+                    type="radio"
+                    :name="name || id || 'radio-group'"
+                    :value="String(option.value)"
+                    :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="[
+                        disabled ? 'cursor-not-allowed' : 'cursor-pointer',
+                        inputClass
+                    ]"
+                    @change="onChange"
+                >
+                <span class="text-xl" :class="optionLabelClass">
+                    {{ option.label }}
+                </span>
+            </label>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { useAttrs } from 'vue'
+
+type RadioOption = {
+    value: string | number
+    label: string
+}
+
+defineOptions({ inheritAttrs: false })
+
+const props = withDefaults(
+    defineProps<{
+        id?: string
+        name?: string
+        label?: string
+        modelValue: string | number | null | undefined
+        options: RadioOption[]
+        disabled?: boolean
+        wrapperClass?: string
+        labelClass?: string
+        groupClass?: string
+        itemClass?: string
+        inputClass?: string
+        optionLabelClass?: string
+    }>(),
+    {
+        name: '',
+        label: '',
+        disabled: false,
+        wrapperClass: '',
+        labelClass: '',
+        groupClass: '',
+        itemClass: '',
+        inputClass: '',
+        optionLabelClass: ''
+    }
+)
+
+const emit = defineEmits<{
+    (event: 'update:modelValue', value: string): void
+}>()
+
+const attrs = useAttrs()
+
+const onChange = (event: Event) => {
+    const target = event.target as HTMLInputElement
+    emit('update:modelValue', target.value)
+}
+</script>
--- 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 mb-2"
+            class="font-bold uppercase text-xl text-primary-700"
            :class="labelClass"
        >
            {{ label }}
@@ -13,9 +13,9 @@
            :value="modelValue ?? ''"
            :disabled="disabled || loading"
            v-bind="attrs"
-            class="border-b border-black justify-self-start text-xl pb-[6px] bg-transparent"
+            class="border-b border-primary-700 justify-self-start text-xl text-primary-700 py-[6px] bg-transparent"
            :class="[
-                isEmpty ? 'text-neutral-400' : 'text-black',
+                isEmpty ? 'text-neutral-400' : 'text-primary-700',
                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-black"
+                class="text-primary-700"
            >
                {{ 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 mb-2"
+            class="font-bold uppercase text-xl text-primary-700"
            :class="labelClass"
        >
            {{ label }}
@@ -16,7 +16,7 @@
            :maxlength="maxlength"
            :disabled="disabled"
            v-bind="attrs"
-            class="border-b border-black text-xl pb-[6px] bg-transparent"
+            class="border-b border-black text-xl py-[6px] bg-transparent text-primary-700"
            :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
@@ -1,6 +1,6 @@
 <template>
  <div class="flex flex-col">
-    <label :for="inputId" class="font-bold uppercase text-xl mb-2">{{ label }}</label>
+    <label :for="inputId" class="font-bold uppercase text-xl text-primary-500">{{ label }}</label>
      <div class="flex items-end gap-8">
          <input
              :id="inputId"
@@ -9,7 +9,7 @@
              type="text"
              :maxlength="maxLength"
              :placeholder="placeholderText"
-              class="border-b border-black flex-1 min-w-0 text-xl uppercase h-[30px]"
+              class="border-b border-black flex-1 min-w-0 text-xl text-primary-500 uppercase h-[36px] py-[6px]"
              @input="handleInput"
          />
          <UiCheckbox
--- a/frontend/components/ui/stepper.vue
+++ b/frontend/components/ui/stepper.vue
@@ -4,7 +4,7 @@
            <div
                v-for="(label, index) in labels"
                :key="label"
-                class="absolute top-0 whitespace-nowrap"
+                class="absolute top-0 whitespace-nowrap text-primary-500"
                :class="labelClass(index)"
                :style="positionStyle(index)"
            >
--- a/frontend/composables/useWeighing.ts
+++ b/frontend/composables/useWeighing.ts
@@ -62,7 +62,7 @@ export const useWeighing = ({
            })
        } else {
            await createWeight({
-                reception: `api/receptions/${reception.value.id}`,
+                reception: `/api/receptions/${reception.value.id}`,
                type: mode,
                dsd: baseDsd,
                weight: baseWeight,
@@ -111,7 +111,7 @@ export const useWeighingShipment = ({

    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 title = computed(() => (modeShipment === 'gross' ? 'Pesée à vide' : 'Pesée à plein'))
    const showLoadingBox = computed(
        () => isFetching.value || (displayWeight.value === null && currentWeightEntry.value === null)
    )
@@ -146,7 +146,7 @@ export const useWeighingShipment = ({
            })
        } else {
            await createWeight({
-                shipment: `api/shipments/${shipment.value.id}`,
+                shipment: `/api/shipments/${shipment.value.id}`,
                type: modeShipment,
                dsd: baseDsd,
                weight: baseWeight,
--- a/frontend/constants/steps.ts
+++ b/frontend/constants/steps.ts
@@ -1,9 +1,10 @@
 export enum StepLabel {
    Reception = 'Réception',
    GrossWeighing = 'Pesée à plein',
-    Selection = 'Sélection réceptionnées',
+    Selection = 'Sélection réception',
    TareWeighing = 'Pesée à vide',
    Shipment = 'Expédition',
+    ShipmentLoading = 'Chargement',
 }

 export const RECEPTION_STEP_LABELS = [
@@ -16,5 +17,6 @@ export const RECEPTION_STEP_LABELS = [
 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
@@ -115,6 +115,10 @@
            "create": "Fournisseur créé avec succès.",
            "update": "Fournisseur mis à jour avec succès."
        },
+        "customer": {
+            "create": "Client créé avec succès.",
+            "update": "Client mis à jour avec succès."
+        },
        "address": {
            "create": "Adresse créée avec succès.",
            "update": "Adresse mise à jour avec succès."
--- a/frontend/layouts/admin.vue
+++ b/frontend/layouts/admin.vue
@@ -1,77 +0,0 @@
-<template>
-    <div class="min-h-screen text-neutral-900 grid grid-rows-[85px,1fr]">
-        <!-- HEADER -->
-        <header class="bg-primary-500 z-50 h-[85px]">
-            <div class="h-full w-full px-6 grid grid-cols-[auto,1fr,auto] items-center gap-8">
-                <NuxtLink to="/" class="grid place-items-center">
-          <span class="grid place-items-center bg-white text-xl font-bold uppercase text-primary-500 p-4">
-            LOGO
-          </span>
-                </NuxtLink>
-
-                <nav class="text-2xl font-bold uppercase text-white"></nav>
-
-                <NuxtLink
-                    to="/"
-                    class="text-xl font-bold uppercase text-white transition hover:opacity-80 justify-self-end"
-                >
-                    Quitter le panel admin
-                </NuxtLink>
-            </div>
-        </header>
-
-        <div class="grid grid-cols-[16rem,1fr] h-[calc(100vh-85px)] min-h-0">
-            <aside class="bg-primary-500 text-white min-h-0 flex flex-col justify-between">
-                <div class="flex flex-col gap-4 p-4 font-bold text-xl">
-                    <!-- Liste des liens à ajouter ci-dessous -->
-                    <NuxtLink to="/admin/dashboard">
-                        Tableau de bord
-                    </NuxtLink>
-                    <NuxtLink to="/admin/supplier/supplier-list">
-                        Fournisseur
-                    </NuxtLink>
-                    <NuxtLink to="/admin/carrier/carrier-list">
-                        Transporteur
-                    </NuxtLink>
-                    <NuxtLink to="/admin/user/list">
-                        Utilisateurs
-                    </NuxtLink>
-                    <NuxtLink to="/admin/customer/customer-list">
-                        Client
-                    </NuxtLink>
-                </div>
-
-                <div class="p-4">
-                        <p class="font-bold text-white text-left">v{{ version }}</p>
-                    <button
-                        @click="handleLogout"
-                        class="w-full bg-red-600 hover:bg-red-700 py-2 rounded font-bold"
-                    >
-                        Déconnexion
-                    </button>
-                </div>
-            </aside>
-
-            <main class="min-h-0 overflow-auto px-12 py-12 ">
-                <div class="w-full ">
-                    <slot />
-                </div>
-            </main>
-        </div>
-    </div>
-</template>
-
-
-<script setup lang="ts">
-import {useAuthStore} from '~/stores/auth'
-
-const auth = useAuthStore()
-const { version } = useAppVersion()
-const handleLogout = async () => {
-    try {
-        await auth.logout()
-    } finally {
-        await navigateTo('/login')
-    }
-}
-</script>
--- a/frontend/layouts/default.vue
+++ b/frontend/layouts/default.vue
@@ -1,53 +1,165 @@
 <template>
-    <div class="min-h-screen bg-white text-neutral-900">
-        <header class="w-full border-b border-neutral-200 bg-primary-500">
-            <div class="flex w-full items-center justify-center px-6 py-4">
+    <div class="min-h-screen text-neutral-900 flex flex-col">
+        <!-- HEADER -->
+        <header class="w-full bg-primary-500 py-5 px-6">
+            <div class="flex w-full items-center justify-between">
+                <!-- Burger (mobile) -->
                <button
                    type="button"
                    class="inline-flex items-center justify-center text-3xl text-white md:hidden"
                    aria-label="Ouvrir le menu"
                    @click="toggleMenu"
                >
-                    <span aria-hidden="true" class="flex items-center"><Icon name="mdi:menu" size="44"/></span>
+          <span aria-hidden="true" class="flex items-center">
+            <Icon name="mdi:menu" size="44"/>
+          </span>
                </button>
-                <nav class="ml-4 hidden items-center gap-8 text-2xl font-bold uppercase text-white md:flex">
-                    <NuxtLink to="/" custom v-slot="{ href, navigate, isExactActive }">
+
+                <!-- Logo -->
+                <NuxtLink to="/" class="shrink-0">
+          <span class="flex items-center justify-center bg-white text-xl font-bold uppercase px-6 py-4">
+            LOGO
+          </span>
+                </NuxtLink>
+
+                <!-- NAV centré (desktop) -->
+                <nav
+                    class="hidden md:flex flex-1 items-center justify-center gap-8 text-xl font-bold uppercase text-white"
+                >
+                    <NuxtLink to="/" custom v-slot="{ href, navigate }">
                        <a
                            :href="href"
                            @click="navigate"
-                            :class="isExactActive ? 'opacity-100' : 'opacity-50'"
+                            :class="route.path === '/'
+                            ? 'opacity-100'
+                            : 'opacity-65 hover:opacity-100 transition'"
                        >
                            Accueil
                        </a>
                    </NuxtLink>
+
                    <NuxtLink
-                        to="/admin/dashboard" custom v-slot="{ href, navigate, isActive }"
                        v-if="auth.isAdmin"
+                        to="/admin/supplier/supplier-list"
+                        custom
+                        v-slot="{ href, navigate }"
                    >
                        <a
                            :href="href"
                            @click="navigate"
+                            :class="route.path.startsWith('/admin/supplier')
+                            ? 'opacity-100'
+                            : 'opacity-65 hover:opacity-100 transition'"
                        >
-                            Admin
+                            Fournisseurs
+                        </a>
+                    </NuxtLink>
+
+                    <NuxtLink
+                        v-if="auth.isAdmin"
+                        to="/admin/carrier/carrier-list"
+                        custom
+                        v-slot="{ href, navigate }"
+                    >
+                        <a
+                            :href="href"
+                            @click="navigate"
+                            :class="route.path.startsWith('/admin/carrier')
+                            ? 'opacity-100'
+                            : 'opacity-65 hover:opacity-100 transition'"
+                        >
+                            Transporteurs
+                        </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/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 }"
+                    >
+                        <a
+                            :href="href"
+                            @click="navigate"
+                            :class="route.path.startsWith('/admin/bovin')
+                            ? 'opacity-100'
+                            : 'opacity-65 hover:opacity-100 transition'"
+                        >
+                            Bovins
                        </a>
                    </NuxtLink>
                </nav>
-                <NuxtLink to="/" class="flex flex-1 items-center justify-center gap-3">
-                  <span
-                      class="flex items-center justify-center bg-white text-xl font-bold uppercase text-primary-500 p-4"
-                  >
-                    LOGO
-                  </span>
-                </NuxtLink>
+
+                <!-- Spacer mobile (pour centrer visuellement le header si besoin) -->
                <div class="w-[44px] md:hidden"></div>
-                <button
-                    type="button"
-                    class="ml-auto hidden text-xl font-bold uppercase text-white transition hover:opacity-80 md:inline-flex"
-                    @click="handleLogout"
-                >
-                    Déconnexion
-                </button>
+
+                <!-- User dropdown à droite (desktop) -->
+                <div v-if="auth.isAuthenticated" class="ml-auto relative hidden md:flex items-center text-white group">
+                    <button
+                        type="button"
+                        class="inline-flex items-center py-2 -my-2 text-xl leading-none transition hover:opacity-80"
+                        aria-haspopup="true"
+                    >
+                        <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"/>
+                        </span>
+                    </button>
+
+                    <div
+                        class="absolute right-0 top-full z-10 w-56 rounded-md bg-primary-500 py-2 border-neutral-300 border shadow-lg
+                        opacity-0 invisible pointer-events-none transition
+                        group-hover:opacity-100 group-hover:visible group-hover:pointer-events-auto
+                        group-focus-within:opacity-100 group-focus-within:visible group-focus-within:pointer-events-auto"
+                        role="menu"
+                    >
+                        <button
+                            type="button"
+                            class="w-full px-4 py-2 text-left text-sm font-semibold text-white opacity-85 hover:opacity-100 transition"
+                            @click="handleLogout"
+                        >
+                            Déconnexion
+                        </button>
+                    </div>
+                </div>
            </div>
+
+            <!-- Overlay (mobile) -->
            <transition
                enter-active-class="transition duration-200 ease-out"
                enter-from-class="opacity-0"
@@ -62,6 +174,8 @@
                    @click="closeMenu"
                />
            </transition>
+
+            <!-- Drawer (mobile) -->
            <transition
                enter-active-class="transition duration-200 ease-out"
                enter-from-class="-translate-x-full"
@@ -72,9 +186,7 @@
            >
                <aside
                    v-if="isMenuOpen"
-                    class="fixed left-0 top-0 z-50 h-full w-full bg-primary-600 px-6 pb-8 pt-6 text-white shadow-xl md:hidden"
-                    role="dialog"
-                    aria-modal="true"
+                    class="fixed left-0 top-0 z-50 h-full w-full bg-primary-500 px-6 pb-8 pt-6 text-white shadow-xl md:hidden"
                >
                    <div class="flex items-center justify-between">
                        <span class="text-2xl font-bold uppercase">Menu</span>
@@ -87,12 +199,30 @@
                            <Icon name="mdi:close" size="44"/>
                        </button>
                    </div>
+
                    <nav class="mt-8 flex flex-col gap-6 text-xl font-bold uppercase">
-                        <NuxtLink to="/" class="opacity-100" @click="closeMenu">Accueil</NuxtLink>
+                        <NuxtLink to="/admin/dashboard" @click="closeMenu">Accueil</NuxtLink>
+                        <NuxtLink v-if="auth.isAdmin" to="/admin/supplier/supplier-list" @click="closeMenu">
+                            Fournisseurs
+                        </NuxtLink>
+                        <NuxtLink v-if="auth.isAdmin" to="/admin/carrier/carrier-list" @click="closeMenu">
+                            Transporteurs
+                        </NuxtLink>
+                        <NuxtLink v-if="auth.isAdmin" to="/admin/user/list" @click="closeMenu">
+                            Utilisateurs
+                        </NuxtLink>
+                        <NuxtLink v-if="auth.isAdmin" to="/admin/customer/customer-list" @click="closeMenu">
+                            Clients
+                        </NuxtLink>
+                        <NuxtLink v-if="auth.isAdmin" to="/admin/bovin/list" @click="closeMenu">
+                            Bovins
+                        </NuxtLink>
                    </nav>
+
                    <button
+                        v-if="auth.isAuthenticated"
                        type="button"
-                        class="mt-5 text-xl font-bold uppercase"
+                        class="mt-6 text-xl font-bold uppercase"
                        @click="handleLogout"
                    >
                        Déconnexion
@@ -100,10 +230,10 @@
                </aside>
            </transition>
        </header>
-        <main class="mx-auto w-full max-w-[1280px] pb-0">
+        <main class="mx-auto w-full max-w-[1280px] mt-16">
            <slot/>
        </main>
-        <footer class="w-full mt-8 bg-primary-500 p-6">
+        <footer class="w-full mt-auto bg-primary-500 px-6 py-3">
            <p class="font-bold text-white text-right">v{{ version }}</p>
        </footer>
    </div>
@@ -114,9 +244,12 @@ import {useAuthStore} from '~/stores/auth'

 const route = useRoute()
 const auth = useAuthStore()
-const isMenuOpen = ref(false)
 const {version} = useAppVersion()

+const isMenuOpen = ref(false)
+
+const userDisplayName = computed(() => auth.user?.username ?? 'Utilisateur')
+
 const closeMenu = () => {
    isMenuOpen.value = false
 }
--- a/frontend/pages/admin/bovin/[[id]].vue
+++ b/frontend/pages/admin/bovin/[[id]].vue
@@ -0,0 +1,104 @@
+<template>
+    <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>
+
+            <UiButton
+                type="submit"
+                :disabled="isLoading || isHydrating"
+                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"
+            >
+                <Icon :name="isEdit ? '' : 'mdi:plus'" size="28" />
+                {{ isEdit ? 'Valider' : '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>
+
+<script setup lang="ts">
+import {createBovin, getBovin, updateBovin} from "~/services/bovine-type";
+import type {BovineTypeData, BovinFormData} from "~/services/dto/bovine-type-data";
+const router = useRouter()
+const route = useRoute()
+const isLoading = ref(false)
+const isHydrating = ref(false)
+
+function 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 idBovin = computed(() => resolveId(route.params.id))
+const isEdit = computed(() => idBovin.value !== null)
+
+const form = reactive<BovinFormData>({
+    label: '',
+    code: ''
+})
+
+
+const hydrateFromBovin = (bovin: BovineTypeData | null) => {
+    if (!bovin) {
+        return
+    }
+    isHydrating.value = true
+    form.label = bovin.label ?? ''
+    form.code = bovin.code ?? ''
+    isHydrating.value = false
+}
+
+watch(
+    () => idBovin.value,
+    async (id) => {
+        if (id === null) {
+            return
+        }
+        isLoading.value = true
+        try {
+            const bovin = await getBovin(id)
+            hydrateFromBovin(bovin)
+        } finally {
+            isLoading.value = false
+        }
+    },
+    {immediate: true}
+)
+async function validate() {
+    if (isLoading.value || isHydrating.value) return
+
+    const normalizedBovinCode = form.code.trim()
+    const normalizedBovinLabel = form.label.trim()
+
+
+    const basePayload = {
+        label: normalizedBovinLabel,
+        code: normalizedBovinCode
+
+    }
+
+    isLoading.value = true
+    try {
+        if (isEdit.value && idBovin.value !== null) {
+            await updateBovin(idBovin.value, basePayload)
+        } else {
+            await createBovin(basePayload)
+        }
+        await navigate()
+    } finally {
+        isLoading.value = false
+    }
+}
+
+async function navigate(){
+    return router.push("/admin/bovin/list")
+}
+</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,31 +1,41 @@

 <template>
    <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="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-4xl text-primary-500 font-bold uppercase">
+                {{ route.params.id ? 'Modifications du transporteur' : 'Ajout d\'un transporteur' }}
+            </h1>
+        </div>

-        <button
-            type="submit"
-            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
-        >Enregistrer
-        </button>
-    </div>
+        <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"
+            />

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

 </template>
@@ -33,21 +43,25 @@
 <script setup lang="ts">
 import {createCarrier, getCarrier, updateCarrier} from "~/services/carrier";
 import type {CarrierData, CarrierFormData} from "~/services/dto/carrier-data";
+import {computed} from "vue";
 const router = useRouter()
 const route = useRoute()
-const idCarrier = Number(route.params.id)
+const idCarrier = computed(() => resolveId(route.params.id))
 const isLoading = ref(false)
 const isHydrating = ref(false)

+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 form = reactive<CarrierFormData>({
    code:'',
    name:''
 })

-definePageMeta({
-    layout: 'admin'
-})
-
 const hydrateFromUser = (carrier: CarrierData | null) => {
    if (!carrier) {
        return
@@ -59,7 +73,7 @@ const hydrateFromUser = (carrier: CarrierData | null) => {
 }

 watch(
-    () => idCarrier,
+    () => idCarrier.value,
    async (id) => {
        if (id === null) {
            return
@@ -85,8 +99,8 @@ async function validate() {

    }

-    if(idCarrier){
-        await updateCarrier(idCarrier, basePayload)
+    if(idCarrier.value){
+        await updateCarrier(idCarrier.value, basePayload)
        navigate()
        return
    }
--- a/frontend/pages/admin/carrier/carrier-list.vue
+++ b/frontend/pages/admin/carrier/carrier-list.vue
@@ -1,23 +1,18 @@
 <template>

    <div class="flex items-center justify-between ">
-            <h1 class="text-3xl font-bold uppercase">listes des transporteurs</h1>
-            <NuxtLink
-                to="/admin/carrier"
-                class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            >Ajouter
-            </NuxtLink>
+            <h1 class="text-4xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
    </div>

-        <div class="mt-6 border border-slate-200 mb-16 ">
-            <div class="grid grid-cols-2 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
+        <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 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
+                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)"
@@ -27,6 +22,15 @@
                <div>{{ carrier.code }}</div>
            </div>
        </div>
+    <div class="flex justify-center items-center">
+        <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"
+        >
+            <Icon name="mdi:plus" size="28"  />
+            Ajouter
+        </NuxtLink>
+    </div>

 </template>

@@ -41,10 +45,6 @@ const goToCarrier = (id: number) => {
    router.push(`/admin/carrier/${id}`)
 }

-definePageMeta({
-    layout: 'admin'
-})
-
 onMounted(async () => {
    carrierList.value = await getCarrierList(false)
 })
--- a/frontend/pages/admin/customer/[[id]].vue
+++ b/frontend/pages/admin/customer/[[id]].vue
@@ -1,12 +1,197 @@
 <template>
+    <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>

+            <UiButton
+                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"
+                type="submit"
+                :disabled="isLoading || !auth.isAdmin"
+            >
+                <Icon :name="customerId ? '' : 'mdi:plus'" size="28" />
+                {{ customerId ? "Valider" : "Ajouter" }}
+            </UiButton>
+        </div>
+
+        <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="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 text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
+                :disabled="customerId === null || !auth.isAdmin"
+                @click="goToAddAddress"
+            >
+                <Icon name="mdi:plus" size="28" />
+                Ajouter
+            </UiButton>
+        </div>
+        <div class="overflow-x-auto mb-10">
+            <table class="w-full border-collapse">
+                <thead>
+                <tr class="text-left border-b border-gray-200">
+                    <th class="py-3 pr-4 text-sm uppercase">Libellé</th>
+                    <th class="py-3 pr-4 text-sm uppercase">Rue</th>
+                    <th class="py-3 pr-4 text-sm uppercase">Complément</th>
+                    <th class="py-3 pr-4 text-sm uppercase">Code postal</th>
+                    <th class="py-3 pr-4 text-sm uppercase">Ville</th>
+                    <th class="py-3 pr-4 text-sm uppercase">Pays</th>
+                </tr>
+                </thead>
+                <tbody>
+                <template v-if="form.addresses.length === 0">
+                    <tr>
+                        <td colspan="6" 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-b 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 pr-4">{{ address.label || "—" }}</td>
+                        <td class="py-3 pr-4">{{ address.street || "—" }}</td>
+                        <td class="py-3 pr-4">{{ address.street2 || "—" }}</td>
+                        <td class="py-3 pr-4">{{ address.postalCode || "—" }}</td>
+                        <td class="py-3 pr-4">{{ address.city || "—" }}</td>
+                        <td class="py-3 pr-4">{{ address.countryCode || "—" }}</td>
+                    </tr>
+                </template>
+                </tbody>
+            </table>
+        </div>
+    </form>
 </template>

 <script setup lang="ts">
-definePageMeta({layout: "admin"})
+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 {useAuthStore} from "~/stores/auth"

 const route = useRoute()
 const router = useRouter()
 const auth = useAuthStore()

+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 customerId = computed(() => resolveId(route.params.id))
+const isLoading = ref(false)
+const form = reactive<CustomerFormData>({
+    name: "",
+    phone: "",
+    email: "",
+    addresses: [],
+})
+
+const goToAddAddress = () => {
+    if (customerId.value === null || !auth.isAdmin) return
+    router.push({
+        path: "/admin/customer/address",
+        query: {
+            customerId: String(customerId.value),
+        },
+    })
+}
+
+const goToEditAddress = (addressId: number | null) => {
+    if (customerId.value === null || addressId === null || !auth.isAdmin) return
+    router.push({
+        path: "/admin/customer/address",
+        query: {
+            customerId: String(customerId.value),
+            addressId: String(addressId),
+        },
+    })
+}
+
+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,
+        label: address.label ?? "",
+        street: address.street ?? "",
+        street2: address.street2 ?? null,
+        postalCode: address.postalCode ?? "",
+        city: address.city ?? "",
+        countryCode: address.countryCode ?? "",
+    }))
+}
+
+watch(
+    () => customerId.value,
+    async (id) => {
+        if (id === null) return
+        isLoading.value = true
+        try {
+            const customer = await getCustomer(id)
+            hydrateFromCustomer(customer)
+        } finally {
+            isLoading.value = false
+        }
+    },
+    {immediate: true}
+)
+
+async function validate() {
+    if (isLoading.value) return
+    if (!auth.isAdmin) return
+    isLoading.value = true
+
+    try {
+        const name = form.name.trim()
+        const phone = form.phone?.trim() || null
+        const email = form.email?.trim() || null
+
+        const customerPayload: CustomerPayload = {
+            name,
+            phone,
+            email,
+        }
+        let targetId: number | null = null
+
+        if (customerId.value !== null) {
+            await updateCustomer(customerId.value, customerPayload)
+            targetId = customerId.value
+        } else {
+            const created = await createCustomer(customerPayload)
+            targetId = created.id
+        }
+
+        if (targetId !== null) {
+            await router.push(`/admin/customer/${targetId}`)
+        }
+    } finally {
+        isLoading.value = false
+    }
+}
 </script>
--- a/frontend/pages/admin/customer/address.vue
+++ b/frontend/pages/admin/customer/address.vue
@@ -0,0 +1,47 @@
+<template>
+    <Address type="customer" :address="address" @validate="validate"/>
+</template>
+
+<script setup lang="ts">
+import type { AddressData, AddressPayload } from "~/services/address"
+import { createAddress, getAddress, updateAddress } from "~/services/address"
+import { getCustomer, updateCustomer } from "~/services/customer"
+import type { CustomerData } from "~/services/dto/customer-data"
+
+const route = useRoute()
+const router = useRouter()
+const customerId = computed(() => Number(route.query.customerId))
+const customer = ref<CustomerData | null>(null)
+const addressId = computed(() => (route.query.addressId !== undefined ? Number(route.query.addressId) : null))
+const address = ref<AddressData | null>(null)
+
+const validate = async (payload: AddressPayload) => {
+    try {
+        if (addressId.value !== null) {
+            await updateAddress(addressId.value, payload)
+        } else {
+            await addAddress(payload)
+        }
+    } finally {
+        await router.push("/admin/customer/" + customerId.value)
+    }
+}
+
+const addAddress = async (payload: AddressPayload) => {
+    const response: AddressData = await createAddress(payload)
+    const addressIRI = `/api/addresses/${response.id}`
+    const existingIris = (customer.value?.addresses ?? [])
+        .map((item: any) => (typeof item === "string" ? item : `/api/addresses/${item.id}`))
+        .filter((iri: string | null) => Boolean(iri)) as string[]
+    const next = [...new Set([...existingIris, addressIRI])]
+
+    return await updateCustomer(customerId.value, { addresses: next })
+}
+
+onMounted(async () => {
+    customer.value = await getCustomer(customerId.value)
+    if (addressId.value !== null) {
+        address.value = await getAddress(addressId.value)
+    }
+})
+</script>
--- a/frontend/pages/admin/customer/customer-list.vue
+++ b/frontend/pages/admin/customer/customer-list.vue
@@ -1,12 +1,13 @@
 <template>
    <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase">Client</h1>
+        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des Clients</h1>
        <NuxtLink
            to="/admin/customer"
-            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            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>
@@ -14,10 +15,11 @@
    <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 top-0 z-10 grid grid-cols-7 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
+                class="sticky top-0 z-10 grid grid-cols-8 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
            >
                <div>Nom</div>
-                <div>Code</div>
+                <div>Téléphone</div>
+                <div>Email</div>
                <div>Rue</div>
                <div>Complément</div>
                <div>Code Postal</div>
@@ -26,17 +28,18 @@
            </div>

            <div v-if="customerList.length === 0" class="px-4 py-6 text-slate-400">
-                Aucun fournisseur.
+                Aucun client.
            </div>

            <div v-for="customer in customerList" :key="customer.id">
                <div
                    v-if="!customer.addresses || customer.addresses.length === 0"
-                    class="grid grid-cols-7 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
+                    class="grid grid-cols-8 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
                    @click="goToCustomer(customer.id)"
                >
-                    <div class="truncate">{{ customer.label }}</div>
-                    <div class="truncate">{{ customer.code }}</div>
+                    <div class="truncate">{{ customer.name || "—" }}</div>
+                    <div class="truncate">{{ customer.phone || "—" }}</div>
+                    <div class="truncate">{{ customer.email || "—" }}</div>
                    <div class="col-span-1">Pas d'adresse</div>
                    <div class="uppercase truncate">{{"—"}}</div>
                    <div class="uppercase truncate">{{"—"}}</div>
@@ -48,14 +51,15 @@
                    <div
                        v-for="(address, idx) in customer.addresses"
                        :key="address.id ?? `${customer.id}-${idx}-${address.street}-${address.postalCode}`"
-                        class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                        class="grid grid-cols-8 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
                        :class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
                        @click="goToCustomer(customer.id)"
                    >
                        <div class="truncate">
-                            {{ idx === 0 ? customer.label : "↳" }}
+                            {{ idx === 0 ? (customer.name || "—") : "↳" }}
                        </div>
-                        <div class="truncate">{{ idx === 0 ? customer.code : ""  }}</div>
+                        <div class="truncate">{{ idx === 0 ? (customer.phone || "—") : ""  }}</div>
+                        <div class="truncate">{{ idx === 0 ? (customer.email || "—") : ""  }}</div>
                        <div class="truncate">{{ address.street || "—" }}</div>
                        <div class="truncate">{{ address.street2 || "—" }}</div>
                        <div>{{ address.postalCode || "—"  }}</div>
@@ -66,11 +70,12 @@

                <template v-else>
                    <div
-                        class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                        class="grid grid-cols-8 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
                        @click="goToCustomer(customer.id)"
                    >
-                        <div class="truncate">{{ customer.label }}</div>
-                        <div class="truncate">{{ customer.code }}</div>
+                        <div class="truncate">{{ customer.name || "—" }}</div>
+                        <div class="truncate">{{ customer.phone || "—" }}</div>
+                        <div class="truncate">{{ customer.email || "—" }}</div>
                        <div class="col-span-5 text-slate-400">
                            Adresses non chargées
                        </div>
@@ -89,8 +94,6 @@ import { getCustomerList } from "~/services/customer"
 import type { CustomerData } from "~/services/dto/customer-data"
 import { useAuthStore } from "~/stores/auth"

-definePageMeta({ layout: "admin" })
-
 const customerList = ref<CustomerData[]>([])
 const router = useRouter()
 const auth = useAuthStore()
--- a/frontend/pages/admin/dashboard.vue
+++ b/frontend/pages/admin/dashboard.vue
@@ -1,7 +0,0 @@
-<template>
-</template>
-<script setup lang="ts">
-definePageMeta({
-    layout: 'admin'
-})
-</script>
--- a/frontend/pages/admin/supplier/[[id]].vue
+++ b/frontend/pages/admin/supplier/[[id]].vue
@@ -1,47 +1,44 @@
 <template>
    <form @submit.prevent="validate">
-        <div class="flex items-center justify-between gap-10">
-            <h1 class="text-3xl font-bold uppercase">
+
+        <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 ? "Modifications du fournisseur" : "Ajout d'un fournisseur" }}
            </h1>
+        </div>

-            <button
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+        <div class="flex flex-cols-3 justify-between mb-11 pt-7">
+            <UiTextInput id="supplier-name" v-model="form.name" label="Nom du fournisseur" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
+            <UiTextInput id="supplier-email" v-model="form.email" label="Email" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
+            <UiTextInput id="supplier-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
+        </div>
+        <div class="flex items-center justify-center">
+            <UiButton
+                class="inline-flex mb-28 items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
                type="submit"
                :disabled="isLoading || !auth.isAdmin"
            >
-                {{ supplierId ? "Sauvegarder" : "Ajouter" }}
-            </button>
+                <Icon :name="supplierId ? '' : 'mdi:plus'" size="28" />
+                {{ supplierId ? "Valider" : "Ajouter" }}
+            </UiButton>
        </div>

-        <div class="grid grid-cols-2 gap-y-16 gap-x-12 mb-10 py-12  border-b border-black ">
-            <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 class="flex items-center justify-between mb-7">
+            <h2 class="text-3xl text-primary-500 font-bold uppercase">Adresses fournisseur</h2>
        </div>
-
-        <div class="flex items-center justify-between 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>
-            <button
-                type="button"
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-                :disabled="supplierId === null || !auth.isAdmin"
-                @click="goToAddAddress"
-            >
-                Ajouter
-            </button>
-        </div>
-        <div class="overflow-x-auto mb-10">
+        <div class="overflow-x-auto mb-11 text-primary-700">
            <table class="w-full border-collapse">
                <thead>
-                <tr class="text-left border-b border-gray-200">
-                    <th class="py-3 pr-4 text-sm uppercase">Libellé</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Rue</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Complément</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Code postal</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Ville</th>
-                    <th class="py-3 pr-4 text-sm uppercase">Pays</th>
+                <tr class="text-left border bg-slate-100 border-gray-200">
+                    <th class="py-3 px-4 text-sm uppercase">Libellé</th>
+                    <th class="py-3 px-4 text-sm uppercase">Rue</th>
+                    <th class="py-3 px-4 text-sm uppercase">Complément</th>
+                    <th class="py-3 px-4 text-sm uppercase">Code postal</th>
+                    <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>
@@ -56,21 +53,32 @@
                    <tr
                        v-for="(address, index) in form.addresses"
                        :key="address.id ?? index"
-                        class="border-b border-gray-100 hover:bg-slate-50"
+                        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 pr-4">{{ address.label || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.street || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.street2 || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.postalCode || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.city || "—" }}</td>
-                        <td class="py-3 pr-4">{{ address.countryCode || "—" }}</td>
+                        <td class="py-3 px-4">{{ address.label || "—" }}</td>
+                        <td class="py-3 px-4">{{ address.street || "—" }}</td>
+                        <td class="py-3 px-4">{{ address.street2 || "—" }}</td>
+                        <td class="py-3 px-4">{{ address.postalCode || "—" }}</td>
+                        <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">
+        <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>
    </form>
 </template>

@@ -80,8 +88,6 @@ import {createSupplier, getSupplier, updateSupplier} from "~/services/supplier"
 import type {SupplierData, SupplierFormData, SupplierPayload} from "~/services/dto/supplier-data"
 import {useAuthStore} from "~/stores/auth"

-definePageMeta({layout: "admin"})
-
 const route = useRoute()
 const router = useRouter()
 const auth = useAuthStore()
@@ -179,14 +185,17 @@ async function validate() {
            email,
            phone,
        }
+        let targetId: number | null = null

        if (supplierId.value !== null) {
            await updateSupplier(supplierId.value, supplierPayload)
+            targetId = supplierId.value
        } else {
-            await createSupplier(supplierPayload)
+            const created = await createSupplier(supplierPayload)
+            targetId = created.id
        }

-        await router.push("/admin/supplier/supplier-list")
+        await router.push(`/admin/supplier/${targetId}`)
    } finally {
        isLoading.value = false
    }
--- a/frontend/pages/admin/supplier/address.vue
+++ b/frontend/pages/admin/supplier/address.vue
@@ -8,8 +8,6 @@ import {createAddress, getAddress, updateAddress} from "~/services/address";
 import {getSupplier, updateSupplier} from "~/services/supplier";
 import type {SupplierData} from "~/services/dto/supplier-data";

-definePageMeta({ layout: "admin" })
-
 const route = useRoute()
 const router = useRouter()
 const supplierId = computed(() => { return Number(route.query.supplierId) })
--- a/frontend/pages/admin/supplier/supplier-list.vue
+++ b/frontend/pages/admin/supplier/supplier-list.vue
@@ -1,20 +1,12 @@
 <template>
    <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase">Fournisseurs</h1>
-        <NuxtLink
-            to="/admin/supplier"
-            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
-            @click="handleAddClick"
-        >
-            Ajouter
-        </NuxtLink>
+        <h1 class="text-4xl font-bold uppercase text-primary-500">Liste des fournisseurs</h1>
    </div>

-    <div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
+    <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 top-0 z-10 grid grid-cols-7 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
+                class="sticky text-primary-700 top-0 z-10 grid grid-cols-7 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
            >
                <div>Nom</div>
                <div>Mail</div>
@@ -32,7 +24,7 @@
            <div v-for="supplier in supplierList" :key="supplier.id">
                <div
                    v-if="!supplier.addresses || supplier.addresses.length === 0"
-                    class="grid grid-cols-7 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
+                    class="grid text-primary-700  grid-cols-7 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
                    @click="goToSupplier(supplier.id)"
                >
                    <div class="truncate">{{ supplier.name }}</div>
@@ -48,7 +40,7 @@
                    <div
                        v-for="(address, idx) in supplier.addresses"
                        :key="address.id ?? `${supplier.id}-${idx}-${address.street}-${address.postalCode}`"
-                        class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                        class="grid grid-cols-7 text-primary-700 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
                        :class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
                        @click="goToSupplier(supplier.id)"
                    >
@@ -66,7 +58,7 @@

                <template v-else>
                    <div
-                        class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                        class="grid grid-cols-7 text-primary-700 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
                        @click="goToSupplier(supplier.id)"
                    >
                        <div class="truncate">{{ supplier.name }}</div>
@@ -79,9 +71,20 @@
            </div>
        </div>
    </div>
-    <div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
+    <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">
+        <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="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
+            @click="handleAddClick"
+        >
+            <Icon name="mdi:plus" size="28" />
+            Ajouter
+        </NuxtLink>
+    </div>
 </template>

 <script setup lang="ts">
@@ -89,8 +92,6 @@ import { getSupplierList } from "~/services/supplier"
 import type { SupplierData } from "~/services/dto/supplier-data"
 import { useAuthStore } from "~/stores/auth"

-definePageMeta({ layout: "admin" })
-
 const supplierList = ref<SupplierData[]>([])
 const router = useRouter()
 const auth = useAuthStore()
--- a/frontend/pages/admin/user/[[id]].vue
+++ b/frontend/pages/admin/user/[[id]].vue
@@ -5,15 +5,16 @@
            <h1 class="text-3xl font-bold uppercase">
                {{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
            </h1>
-            <button
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            <UiButton
+                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"
                type="submit"
            >
-                {{ userId ? 'Sauvegarder' : 'Ajouter' }}
-            </button>
+                <Icon :name="userId ? '' : 'mdi:plus'" size="28" />
+                {{ userId ? 'Valider' : 'Ajouter' }}
+            </UiButton>
        </div>

-        <div class="grid gap-y-16 gap-x-40 mb-16">
+        <div class="grid gap-y-16 gap-x-40 py-12">
            <UiTextInput
                id="user-name"
                v-model="form.username"
@@ -38,14 +39,10 @@
    </form>
 </template>
 <script setup lang="ts">
-definePageMeta({
-    layout: 'admin'
-})
-
 import {computed, reactive, ref, watch} from 'vue'
 import {ROLE} from '~/utils/constants'
 import {createUser, updateUser, getUser} from '~/services/auth'
-import type {UserData, UserFormData} from '~/services/dto/user-data'
+import type {UserData, UserFormData, UserPayload} from '~/services/dto/user-data'

 const route = useRoute()
 const router = useRouter()
@@ -105,10 +102,12 @@ async function validate() {
    const normalizedRole = form.role.trim()
    const normalizedPassword = form.password.trim()

-    const basePayload = {
+    const basePayload: UserPayload = {
        username: normalizedUsername,
        roles: normalizedRole ? [normalizedRole] : undefined,
-        password: normalizedPassword || undefined
+    }
+    if (normalizedPassword) {
+        basePayload.password = normalizedPassword
    }

    if (userId.value) {
--- a/frontend/pages/admin/user/list.vue
+++ b/frontend/pages/admin/user/list.vue
@@ -1,10 +1,11 @@
 <template>
    <div class="flex items-center justify-between">
-        <h1 class="text-3xl font-bold uppercase">Liste des utilisateurs</h1>
+        <h1 class="text-3xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
        <NuxtLink
-            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-            @click="router.push('/admin/user/')"
+            to="/admin/user"
+            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"
        >
+            <Icon name="mdi:plus" size="28"  />
            Ajouter
        </NuxtLink>

@@ -28,7 +29,7 @@
                    {{ user.username }}
                </div>
                <div>
-                    {{ user.roles?.join(', ') || ' ---' }}
+                    {{ getRoleLabels(user.roles) }}
                </div>
            </div>
        </div>
@@ -37,20 +38,28 @@


 <script setup lang="ts">
-definePageMeta({
-    layout: 'admin'
-})
-
 import type {UserData} from "~/services/dto/user-data";
-import {getAdminUsers, getUsers} from "~/services/auth";
+import {getAdminUsers} from "~/services/auth";
+import {ROLE} from "~/utils/constants";

 const userList = ref<UserData[]>([])
 const router = useRouter()
+const roleLabelByValue = new Map(ROLE.map((role) => [role.value, role.label]))

 const goToUser = (id: number) => {
    router.push(`/admin/user/${id}`)
 }

+const getRoleLabels = (roles?: string[]) => {
+    if (!roles || roles.length === 0) {
+        return ' ---'
+    }
+
+    return roles
+        .map((role) => roleLabelByValue.get(role) ?? role)
+        .join(', ')
+}
+
 onMounted(async () => {
    userList.value = await getAdminUsers()
 })
--- a/frontend/pages/index.vue
+++ b/frontend/pages/index.vue
@@ -1,15 +1,27 @@
 <script setup lang="ts">
 </script>
 <template>
-    <div class="flex flex-wrap justify-center mt-8 gap-8 mb-8 md:mb-0">
+    <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="/" iconName="mdi:warehouse" />
-        <card-link label="RÉCEPTIONS EN ATTENTE" link="/reception/waiting-reception" iconName="mdi:truck-remove-outline" />
-        <card-link label="EXPÉDITIONS EN ATTENTE" link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container" />
-        <card-link label="CASES" link="/" iconName="mdi:cube-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">
+            <template #label>
+                Réceptions<br>EN ATTENTE
+            </template>
+        </card-link>
+        <card-link 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="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 label="PASSEPORT DU BOVIN" link="/" iconName="mdi:cow" />
+        <card-link link="/" iconName="mdi:cow">
+            <template #label>
+                PASSEPORT<br>DU BOVIN
+            </template>
+        </card-link>
    </div>
 </template>
--- a/frontend/pages/infrastructure/building.vue
+++ b/frontend/pages/infrastructure/building.vue
@@ -0,0 +1,242 @@
+<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
@@ -0,0 +1,27 @@
+<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
@@ -39,13 +39,13 @@
        />
      </div>

-      <button
+      <UiButton
        type="submit"
        class="w-full rounded-md bg-primary-500 px-4 py-2 text-base font-semibold text-white transition hover:bg-primary-600 disabled:cursor-not-allowed disabled:opacity-60"
        :disabled="isSubmitting"
      >
        Connexion
-      </button>
+      </UiButton>
          <p class="font-bold">v{{ version }}</p>
      </form>
  </div>
--- a/frontend/pages/reception/[[id]].vue
+++ b/frontend/pages/reception/[[id]].vue
@@ -1,29 +1,28 @@
 <template>
-    <div>
-        <div class="flex justify-between h-[52px] mb-[80px]">
-            <div class="flex flex-1 mr-16">
-                <UiStepper
-                    :labels="RECEPTION_STEP_LABELS"
-                    :current-step="storeReception?.currentStep ?? 0"
-                    @select="handleStepSelect"
-                />
-            </div>
-            <button
-                type="button"
-                class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
-                @click="saveAndHold"
-            >Mettre en attente</button>
+    <div class="flex justify-between h-[52px] mb-[80px]">
+        <div class="flex flex-1 mr-16">
+            <UiStepper
+                :labels="RECEPTION_STEP_LABELS"
+                :current-step="storeReception?.currentStep ?? 0"
+                @select="handleStepSelect"
+            />
        </div>
-        <ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
-        <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"/>
-        <ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
+        <UiButton
+            type="button"
+            class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
+            @click="saveAndHold"
+        >Mettre en attente
+        </UiButton>
    </div>
+    <ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
+    <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"/>
+    <ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
 </template>

 <script setup lang="ts">
--- a/frontend/pages/reception/finish-reception.vue
+++ b/frontend/pages/reception/finish-reception.vue
@@ -1,10 +1,10 @@
 <template>
    <div class="flex items-center justify-start gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" />
-            <h1 class="text-3xl font-bold uppercase">listes des réceptions finie</h1>
+            <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 finie</h1>
    </div>

-    <div class="ps-20 " >
+    <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>
@@ -27,7 +27,7 @@
                <div>{{ reception.supplier?.name }}</div>
                <div>{{ reception.address?.fullAddress }}</div>
                <div>{{ reception.receptionType?.label }}</div>
-                <div>{{ formatWeighing(reception, 'gross') }} | {{ formatWeighing(reception, 'tare') }}</div>
+                <div>{{ formatWeighing(reception) }}</div>
            </div>
        </div>
    </div>
@@ -36,16 +36,20 @@
 <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[]>()
 const router = useRouter()

-const formatWeighing = (reception: ReceptionData, type: 'gross' | 'tare') => {
-    const entry = reception.weights?.find((weight) => weight.type === type)
-    if (!entry || entry.weight == null || entry.dsd == null) {
+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 `${entry.weight} kg`
+
+    return `${gross - tare} kg`
 }

 const goToReception = (id: number) => {
--- 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,13 +1,13 @@
 <template>
-    <div class="flex items-center justify-between ">
+    <div class="flex items-center justify-between">
        <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" />
-            <h1 class="text-3xl font-bold uppercase">listes des réceptions en attente</h1>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions en attente</h1>
        </div>
    </div>

-    <div class="ps-20 " >
-        <div class="mt-6 border border-slate-200 mb-16 ">
+    <div class="px-[86px]">
+        <div class="mt-6 border border-slate-200 mb-16">
            <div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
                <div>Fournisseur</div>
                <div>Adresse</div>
--- a/frontend/pages/shipment/[[id]].vue
+++ b/frontend/pages/shipment/[[id]].vue
@@ -9,16 +9,17 @@

                />
            </div>
-            <button
+            <UiButton
                type="button"
                class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
                @click="saveAndHold"
            >Mettre en attente
-            </button>
+            </UiButton>
        </div>
        <ShipmentForm v-if="!storeShipment || storeShipment.currentStep === 0" ref="shipmentFormRef"/>
        <ShipmentWeight v-if="storeShipment?.currentStep === 1" mode="gross"/>
-        <ShipmentWeight v-if="storeShipment?.currentStep >= 2" mode="tare"/>
+        <ShipmentLoading v-if="storeShipment?.currentStep === 2"/>
+        <ShipmentWeight v-if="storeShipment?.currentStep === 3" mode="tare"/>

    </div>
 </template>
--- a/frontend/pages/shipment/finish-shipment.vue
+++ b/frontend/pages/shipment/finish-shipment.vue
@@ -1,10 +1,10 @@
 <template>
    <div class="flex items-center justify-start gap-10">
-        <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44"/>
-        <h1 class="text-3xl font-bold uppercase">listes des expéditions finie</h1>
+        <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 finie</h1>
    </div>

-    <div class="ps-20 ">
+    <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>
@@ -21,16 +21,16 @@
                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="goToshipment(shipment.id)"
+                @click="goShipment(shipment.id)"
            >
                <div>{{ shipment.identificationNumber }}</div>
                <div>{{ shipment.shipmentDate }}</div>
-                <div>{{ shipment.customer?.label }}</div>
+                <div>{{ shipment.customer?.name }}</div>
                <div>{{ shipment.address?.fullAddress }}</div>
                <div>
-                    <template v-if="formatBovinShipmentLines(shipment).length">
+                    <template v-if="formatShipmentLines(shipment).length">
                        <div
-                            v-for="(line, index) in formatBovinShipmentLines(shipment)"
+                            v-for="(line, index) in formatShipmentLines(shipment)"
                            :key="index"
                            class="leading-5"
                        >
@@ -38,7 +38,7 @@
                        </div>
                    </template>
                </div>
-                <div>{{ formatWeighing(shipment, 'gross') }} | {{ formatWeighing(shipment, 'tare') }}</div>
+                <div>{{ formatWeighing(shipment) }}</div>
            </div>
        </div>
    </div>
@@ -51,28 +51,32 @@ import {getShipmentList} from "~/services/shipment";
 const shipmentList = ref<ShipmentData[]>()
 const router = useRouter()

-const formatWeighing = (shipment: ShipmentData, type: 'gross' | 'tare') => {
-    const entry = shipment.weights?.find((weight) => weight.type === type)
-    if (!entry || entry.weight == null || entry.dsd == null) {
+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 `${entry.weight} kg`
+
+    return `${gross - tare} kg`
 }

-const formatBovinShipmentLines = (shipment: ShipmentData) => {
-    if (!shipment.bovinShipments?.length) {
+
+const formatShipmentLines = (shipment: ShipmentData) => {
+    if (!shipment.shipmentType && shipment.nbBovinSend == null) {
        return []
    }
-    return shipment.bovinShipments.map((entry) => {
-        const label = typeof entry.shipmentType === 'string'
-            ? entry.shipmentType
-            : entry.shipmentType?.label
-        return `${label ?? '—'} : ${entry.nbBovinSend ?? '—'}`
-    })
+
+    const label = typeof shipment.shipmentType === 'string'
+        ? shipment.shipmentType
+        : shipment.shipmentType?.label
+
+    return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
 }

-const goToshipment = (id: number) => {
-    //router.push(`/shipment/update/${id}`)
+const goShipment = (id: number) => {
+    router.push(`/shipment/update/${id}`)
 }

 onMounted(async () => {
--- a/frontend/pages/shipment/update/[[id]].vue
+++ b/frontend/pages/shipment/update/[[id]].vue
@@ -0,0 +1,639 @@
+<template>
+    <form @submit.prevent="validate">
+        <div class="grid grid-cols-2 h-[461px] items-start gap-y-8 gap-x-40 mb-16">
+            <div class="flex items-center justify-between gap-10 relative col-start-1 row-start-1">
+                <div class="flex flex-row absolute -left-[60px] justify-between">
+                    <Icon @click="router.push('/shipment/finish-shipment')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+                </div>
+                <h1 class="font-bold text-4xl col-start-1 row-start-1 text-primary-500 uppercase">Expédition {{ form.identificationNumber }}</h1>
+                <Icon @click="printReceipt" name="mdi:printer-outline" size="44" class="cursor-pointer text-primary-500"/>
+            </div>
+
+            <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"
+            />
+
+            <UiDateInput
+                id="shipment-date"
+                v-model="form.shipmentDate"
+                label="Date d'expédition"
+                wrapper-class="col-start-1 row-start-3"
+            />
+
+            <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
+                        }))"
+                    />
+                    <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"
+            />
+
+            <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"
+            />
+
+            <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"
+            />
+
+            <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"
+            />
+
+            <div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
+                <UiLicensePlateInput
+                    v-model="form.licensePlate"
+                    v-model:allowAny="allowAnyLicensePlate"
+                />
+            </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"
+            />
+
+            <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"
+                />
+            </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'"
+                    @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'"
+                    @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"
+            >
+                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 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 ?? 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
+    }
+
+    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,12 +1,12 @@
 <template>
-    <div class="flex items-center justify-between ">
+    <div class="flex items-center justify-between">
        <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44"/>
-            <h1 class="text-3xl font-bold uppercase">listes des expéditions en attente</h1>
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
+            <h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions en attente</h1>
        </div>
    </div>

-    <div class="ps-20 ">
+    <div class="px-[86px]">
        <div class="mt-6 border border-slate-200 mb-16 ">
            <div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
                <div>Client</div>
@@ -24,12 +24,12 @@
                @click="goToShipment(shipment.id)"
                @keydown.enter="goToShipment(shipment.id)"
            >
-                <div>{{ shipment.customer?.label }}</div>
+                <div>{{ shipment.customer?.name }}</div>
                <div>{{ shipment.address?.fullAddress }}</div>
                <div>
-                    <template v-if="formatBovinShipmentLines(shipment).length">
+                    <template v-if="formatShipmentLines(shipment).length">
                        <div
-                            v-for="(line, index) in formatBovinShipmentLines(shipment)"
+                            v-for="(line, index) in formatShipmentLines(shipment)"
                            :key="index"
                            class="leading-5"
                        >
@@ -38,7 +38,7 @@
                    </template>
                </div>
                <div>{{ shipment.carrier?.name }}</div>
-                <div>{{ shipment.licencePlate }}</div>
+                <div>{{ shipment.licensePlate }}</div>
            </div>
        </div>
    </div>
@@ -55,16 +55,17 @@ const router = useRouter()
 const goToShipment = (id: number) => {
    router.push(`/shipment/${id}`)
 }
-const formatBovinShipmentLines = (shipment: ShipmentData) => {
-    if (!shipment.bovinShipments?.length) {
+
+const formatShipmentLines = (shipment: ShipmentData) => {
+    if (!shipment.shipmentType && shipment.nbBovinSend == null) {
        return []
    }
-    return shipment.bovinShipments.map((entry) => {
-        const label = typeof entry.shipmentType === 'string'
-            ? entry.shipmentType
-            : entry.shipmentType?.label
-        return `${label ?? '—'} : ${entry.nbBovinSend ?? '—'}`
-    })
+
+    const label = typeof shipment.shipmentType === 'string'
+        ? shipment.shipmentType
+        : shipment.shipmentType?.label
+
+    return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
 }

 onMounted(async () => {
--- a/frontend/services/bovin-shipment.ts
+++ b/frontend/services/bovin-shipment.ts
@@ -1,50 +0,0 @@
-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
@@ -1,5 +1,5 @@
 import { useApi } from '~/composables/useApi'
-import type {BovineTypeData} from "~/services/dto/bovine-type-data";
+import type { BovineTypeData, BovinPayload } from "~/services/dto/bovine-type-data";

 export type BovineTypeListResponse =
    | BovineTypeData[]
@@ -12,12 +12,41 @@ export async function getBovineTypeList(): Promise<BovineTypeData[]> {
    })

    if (Array.isArray(response)) {
-        return response
+        return response.map(mapToBovineTypeData)
    }

    if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
-        return response['hydra:member']
+        return response['hydra:member'].map(mapToBovineTypeData)
    }

    return []
 }
+
+export async function getBovin(id: number): Promise<BovineTypeData> {
+    const api = useApi()
+    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))
+    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))
+    return mapToBovineTypeData(response)
+}
+
+const mapToBovineTypeData = (item: BovineTypeData): BovineTypeData => ({
+    id: item.id,
+    label: item.label,
+    code: item.code
+})
+
+const toBovineTypePayload = (payload: BovinPayload): Partial<BovineTypeData> => ({
+    label: payload.label ?? undefined,
+    code: payload.code ?? undefined
+})
--- a/frontend/services/customer.ts
+++ b/frontend/services/customer.ts
@@ -1,23 +1,43 @@
-import { useApi } from '~/composables/useApi'
-import type { CustomerData } from '~/services/dto/customer-data'
+import { useApi } from "~/composables/useApi"
+import type { CustomerData, CustomerPayload } from "~/services/dto/customer-data"

 export type CustomerListResponse =
    | CustomerData[]
-    | { 'hydra:member'?: CustomerData[] }
+    | { "hydra:member"?: CustomerData[] }

 export async function getCustomerList(): Promise<CustomerData[]> {
    const api = useApi()
-    const response = await api.get<CustomerListResponse>('customers', {}, {
-        toastErrorKey: 'errors.customer.list'
+    const response = await api.get<CustomerListResponse>("customers", {}, {
+        toastErrorKey: "errors.customer.list",
    })

-    if (Array.isArray(response)) {
-        return response
+    if (Array.isArray(response)) return response
+    if (response && typeof response === "object" && Array.isArray(response["hydra:member"])) {
+        return response["hydra:member"]
    }
-
-    if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
-        return response['hydra:member']
-    }
-
    return []
 }
+
+export async function getCustomer(id: number): Promise<CustomerData> {
+    const api = useApi()
+    return api.get<CustomerData>(`customers/${id}`, {}, {
+        toastErrorKey: "errors.customer.fetch",
+    })
+}
+
+export async function updateCustomer(id: number, payload: Partial<CustomerPayload>): Promise<CustomerData> {
+    const api = useApi()
+    return api.patch<CustomerData>(`customers/${id}`, payload, {
+        toastErrorKey: "errors.customer.update",
+        toastSuccessKey: "success.customer.update",
+    })
+}
+
+export async function createCustomer(payload: CustomerPayload): Promise<CustomerData> {
+    const api = useApi()
+    return api.post<CustomerData>("customers", payload, {
+        toastErrorKey: "errors.customer.create",
+        toastSuccessKey: "success.customer.create",
+    })
+}
+
--- a/frontend/services/dto/address-data.ts
+++ b/frontend/services/dto/address-data.ts
@@ -6,6 +6,7 @@ export interface AddressData {
    postalCode: string
    city: string
    countryCode: string
+    fullAddress: string
 }

 export interface AddressFormData {
--- a/frontend/services/dto/bovin-shipment-data.ts
+++ b/frontend/services/dto/bovin-shipment-data.ts
@@ -1,18 +0,0 @@
-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/bovine-type-data.ts
+++ b/frontend/services/dto/bovine-type-data.ts
@@ -3,3 +3,13 @@ export interface BovineTypeData{
    label: string
    code: string
 }
+
+export interface BovinFormData {
+    label: string
+    code: string
+}
+
+export type BovinPayload = {
+    label?: string | null
+    code?: string | null
+}
--- a/frontend/services/dto/building-case-data.ts
+++ b/frontend/services/dto/building-case-data.ts
@@ -0,0 +1,9 @@
+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
@@ -0,0 +1,11 @@
+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
@@ -0,0 +1,6 @@
+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,5 +1,8 @@
+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
@@ -0,0 +1,9 @@
+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,8 +1,25 @@
-import type { AddressData } from "~/services/dto/address-data"
+import type { AddressFormData } from "~/services/dto/address-data"
+
+export type CustomerAddresses = AddressFormData[] | string[]

 export interface CustomerData {
    id: number
-    label: string
-    code?: string | null
-    addresses?: AddressData[] | null
+    name: string
+    phone?: string | null
+    email?: string | null
+    addresses: CustomerAddresses
+}
+
+export interface CustomerFormData {
+    name: string
+    phone?: string
+    email?: string
+    addresses: AddressFormData[]
+}
+
+export type CustomerPayload = {
+    name: string
+    phone?: string | null
+    email?: string | null
+    addresses?: string[]
 }
--- a/frontend/services/dto/reception-data.ts
+++ b/frontend/services/dto/reception-data.ts
@@ -41,9 +41,18 @@ 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'
 }

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

 export type ReceptionFormData = {
+    identificationNumber?: null|string,
    licensePlate: string
    receptionDate: string
    receptionTypeId: string
@@ -79,6 +89,7 @@ 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,6 +2,9 @@ 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
@@ -9,16 +12,10 @@ 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
-    licencePlate: string | null
+    licensePlate: string | null
    shipmentDate: string
    currentStep: number
    isValid: boolean
@@ -26,7 +23,11 @@ export type ShipmentData = {
    carrier?: CarrierData | null
    truck?: TruckData | null
    customer?: CustomerData | null
-    bovinShipments?: BovinShipmentData[] | null
+    user?: UserData | null
+    driver?: DriverData | null
+    vehicle?: VehicleData | null
+    shipmentType?: ShipmentTypeData | null
+    nbBovinSend?: number | null
    weights?: WeightShipmentEntryData[] | null

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

 export type ShipmentPayload = {
-    licencePlate?: string | null
+    licensePlate?: 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/weight-data.ts
+++ b/frontend/services/dto/weight-data.ts
@@ -2,4 +2,13 @@ export interface WeightData {
    weight: number | null
    dsd: number | null
    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/statut.ts
+++ b/frontend/services/statut.ts
@@ -0,0 +1,23 @@
+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/tailwind.config.ts
+++ b/frontend/tailwind.config.ts
@@ -8,17 +8,11 @@ export default <Partial<Config>>{
      },
      colors: {
        primary: {
-          50: '#f6f9ea',
-          100: '#eaf2cf',
-          200: '#d6e3a4',
-          300: '#c1d47a',
-          400: '#afc85a',
-          500: '#9ebb43',
-          600: '#7e9735',
-          700: '#607228',
-          800: '#414d1a',
-          900: '#24290d'
+          700: '#35453C',
+          500: '#456452',
+
        }
+
      }
    }
  }
--- a/migrations/Version20260213093000.php
+++ b/migrations/Version20260213093000.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260213093000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add name, phone and email fields to customer.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE customer ADD name VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE customer ADD phone VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE customer ADD email VARCHAR(255) DEFAULT NULL');
+        $this->addSql('UPDATE customer SET name = label WHERE name IS NULL');
+        $this->addSql('ALTER TABLE customer ALTER COLUMN name SET NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE customer DROP name');
+        $this->addSql('ALTER TABLE customer DROP phone');
+        $this->addSql('ALTER TABLE customer DROP email');
+    }
+}
--- a/migrations/Version20260213101500.php
+++ b/migrations/Version20260213101500.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260213101500 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Align customer with supplier: keep name/email/phone and drop label/code.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE customer ALTER COLUMN name TYPE VARCHAR(180)');
+        $this->addSql('ALTER TABLE customer ALTER COLUMN email TYPE VARCHAR(180)');
+        $this->addSql('ALTER TABLE customer ALTER COLUMN phone TYPE VARCHAR(40)');
+        $this->addSql('ALTER TABLE customer DROP COLUMN label');
+        $this->addSql('ALTER TABLE customer DROP COLUMN code');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE customer ADD label VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE customer ADD code VARCHAR(255) DEFAULT NULL');
+        $this->addSql('UPDATE customer SET label = name WHERE label IS NULL');
+        $this->addSql("UPDATE customer SET code = regexp_replace(upper(name), '[^A-Z0-9]+', '_', 'g') WHERE code IS NULL");
+        $this->addSql('ALTER TABLE customer ALTER COLUMN label SET NOT NULL');
+        $this->addSql('ALTER TABLE customer ALTER COLUMN code SET NOT NULL');
+        $this->addSql('ALTER TABLE customer ALTER COLUMN email TYPE VARCHAR(255)');
+        $this->addSql('ALTER TABLE customer ALTER COLUMN phone TYPE VARCHAR(255)');
+    }
+}
--- a/migrations/Version20260213114000.php
+++ b/migrations/Version20260213114000.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260213114000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Allow only one bovin_shipment row per shipment.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // Keep one row per shipment (latest id), required before adding unique index.
+        $this->addSql(<<<'SQL'
+            DELETE FROM bovin_shipment bs
+            USING (
+                SELECT id, ROW_NUMBER() OVER (PARTITION BY shipment_id ORDER BY id DESC) AS rn
+                FROM bovin_shipment
+                WHERE shipment_id IS NOT NULL
+            ) d
+            WHERE bs.id = d.id
+              AND d.rn > 1
+            SQL);
+
+        $this->addSql('DROP INDEX IF EXISTS uniq_bovin_shipment');
+        $this->addSql('CREATE UNIQUE INDEX uniq_bovin_shipment_one_type ON bovin_shipment (shipment_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX IF EXISTS uniq_bovin_shipment_one_type');
+        $this->addSql('CREATE UNIQUE INDEX uniq_bovin_shipment ON bovin_shipment (shipment_id, shipment_type_id)');
+    }
+}
--- a/migrations/Version20260218144828.php
+++ b/migrations/Version20260218144828.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260218144828 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT fk_7049f4502ee48a36');
+        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT fk_7049f4507be036fc');
+        $this->addSql('DROP TABLE bovin_shipment');
+        $this->addSql('ALTER TABLE shipment ADD nb_bovin_send INT NOT NULL');
+        $this->addSql('ALTER TABLE shipment ADD shipment_type_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC2EE48A36 FOREIGN KEY (shipment_type_id) REFERENCES shipment_type (id) NOT DEFERRABLE');
+        $this->addSql('CREATE INDEX IDX_2CB20DC2EE48A36 ON shipment (shipment_type_id)');
+        $this->addSql('DROP INDEX uniq_weight_shipment_type');
+        $this->addSql('DROP INDEX uniq_weight_reception_type');
+        $this->addSql('ALTER INDEX idx_weight_shipment RENAME TO IDX_7CD55417BE036FC');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE bovin_shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, nb_bovin_send INT NOT NULL, shipment_id INT DEFAULT NULL, shipment_type_id INT DEFAULT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE INDEX idx_7049f4507be036fc ON bovin_shipment (shipment_id)');
+        $this->addSql('CREATE INDEX idx_7049f4502ee48a36 ON bovin_shipment (shipment_type_id)');
+        $this->addSql('CREATE UNIQUE INDEX uniq_bovin_shipment_one_type ON bovin_shipment (shipment_id)');
+        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT fk_7049f4502ee48a36 FOREIGN KEY (shipment_type_id) REFERENCES shipment_type (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT fk_7049f4507be036fc FOREIGN KEY (shipment_id) REFERENCES shipment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC2EE48A36');
+        $this->addSql('DROP INDEX IDX_2CB20DC2EE48A36');
+        $this->addSql('ALTER TABLE shipment DROP nb_bovin_send');
+        $this->addSql('ALTER TABLE shipment DROP shipment_type_id');
+        $this->addSql('CREATE UNIQUE INDEX uniq_weight_shipment_type ON weight (shipment_id, type)');
+        $this->addSql('CREATE UNIQUE INDEX uniq_weight_reception_type ON weight (reception_id, type)');
+        $this->addSql('ALTER INDEX idx_7cd55417be036fc RENAME TO idx_weight_shipment');
+    }
+}
--- a/migrations/Version20260219100826.php
+++ b/migrations/Version20260219100826.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260219100826 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE building_case (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, case_number INT NOT NULL, code VARCHAR(255) NOT NULL, capacity INT NOT NULL, id_building_id INT DEFAULT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE INDEX IDX_DE2CEE505538B3E5 ON building_case (id_building_id)');
+        $this->addSql('CREATE TABLE building_case_position (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, x INT NOT NULL, y INT NOT NULL, w INT NOT NULL, h INT NOT NULL, render_order VARCHAR(255) NOT NULL, building_layout_id INT NOT NULL, building_case_id INT NOT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE INDEX IDX_ACCDF9077040AE67 ON building_case_position (building_layout_id)');
+        $this->addSql('CREATE INDEX IDX_ACCDF907F8D859DF ON building_case_position (building_case_id)');
+        $this->addSql('CREATE TABLE building_layout (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, name VARCHAR(255) NOT NULL, columns INT NOT NULL, rows INT NOT NULL, id_building_id INT NOT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE INDEX IDX_2A8CB1095538B3E5 ON building_layout (id_building_id)');
+        $this->addSql('ALTER TABLE building_case ADD CONSTRAINT FK_DE2CEE505538B3E5 FOREIGN KEY (id_building_id) REFERENCES building (id)');
+        $this->addSql('ALTER TABLE building_case_position ADD CONSTRAINT FK_ACCDF9077040AE67 FOREIGN KEY (building_layout_id) REFERENCES building_layout (id) NOT DEFERRABLE');
+        $this->addSql('ALTER TABLE building_case_position ADD CONSTRAINT FK_ACCDF907F8D859DF FOREIGN KEY (building_case_id) REFERENCES building_case (id) NOT DEFERRABLE');
+        $this->addSql('ALTER TABLE building_layout ADD CONSTRAINT FK_2A8CB1095538B3E5 FOREIGN KEY (id_building_id) REFERENCES building (id) NOT DEFERRABLE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE building_case DROP CONSTRAINT FK_DE2CEE505538B3E5');
+        $this->addSql('ALTER TABLE building_case_position DROP CONSTRAINT FK_ACCDF9077040AE67');
+        $this->addSql('ALTER TABLE building_case_position DROP CONSTRAINT FK_ACCDF907F8D859DF');
+        $this->addSql('ALTER TABLE building_layout DROP CONSTRAINT FK_2A8CB1095538B3E5');
+        $this->addSql('DROP TABLE building_case');
+        $this->addSql('DROP TABLE building_case_position');
+        $this->addSql('DROP TABLE building_layout');
+    }
+}
--- a/migrations/Version20260220101607.php
+++ b/migrations/Version20260220101607.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260220101607 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE statut (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(255) NOT NULL, code VARCHAR(255) NOT NULL, color VARCHAR(255) NOT NULL, PRIMARY KEY (id))');
+        $this->addSql('ALTER TABLE building_case ADD statut_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE building_case ADD CONSTRAINT FK_DE2CEE50F6203804 FOREIGN KEY (statut_id) REFERENCES statut (id)');
+        $this->addSql('CREATE INDEX IDX_DE2CEE50F6203804 ON building_case (statut_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('DROP TABLE statut');
+        $this->addSql('ALTER TABLE building_case DROP CONSTRAINT FK_DE2CEE50F6203804');
+        $this->addSql('DROP INDEX IDX_DE2CEE50F6203804');
+        $this->addSql('ALTER TABLE building_case DROP statut_id');
+    }
+}
--- a/migrations/Version20260225110000.php
+++ b/migrations/Version20260225110000.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260225110000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Rename shipment.licence_plate to license_plate';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE shipment RENAME COLUMN licence_plate TO license_plate');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE shipment RENAME COLUMN license_plate TO licence_plate');
+    }
+}
--- a/migrations/Version20260225123000.php
+++ b/migrations/Version20260225123000.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260225123000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create bovine table and relation to building_case.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE TABLE bovine (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, building_case_id INT DEFAULT NULL, national_number VARCHAR(50) NOT NULL, received_weight INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_EA9E2A42F8D859DF ON bovine (building_case_id)');
+        $this->addSql('CREATE UNIQUE INDEX uniq_bovine_national_number ON bovine (national_number)');
+        $this->addSql('ALTER TABLE bovine ADD CONSTRAINT FK_EA9E2A42F8D859DF FOREIGN KEY (building_case_id) REFERENCES building_case (id) NOT DEFERRABLE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE bovine DROP CONSTRAINT FK_EA9E2A42F8D859DF');
+        $this->addSql('DROP TABLE bovine');
+    }
+}
--- a/migrations/Version20260225131500.php
+++ b/migrations/Version20260225131500.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260225131500 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add arrival_date column to bovine table.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE bovine ADD arrival_date DATE DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE bovine DROP arrival_date');
+    }
+}
--- a/src/Command/SeedCommand.php
+++ b/src/Command/SeedCommand.php
@@ -5,15 +5,24 @@ declare(strict_types=1);
 namespace App\Command;

 use App\Entity\Address;
+use App\Entity\Bovine;
+use App\Entity\BovineType;
 use App\Entity\Building;
+use App\Entity\BuildingCase;
+use App\Entity\BuildingCasePosition;
+use App\Entity\BuildingLayout;
 use App\Entity\Carrier;
+use App\Entity\Customer;
 use App\Entity\Driver;
 use App\Entity\MerchandiseType;
 use App\Entity\PelletType;
 use App\Entity\ReceptionType;
+use App\Entity\ShipmentType;
+use App\Entity\Statut;
 use App\Entity\Supplier;
 use App\Entity\Truck;
 use App\Entity\Vehicle;
+use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -49,8 +58,18 @@ class SeedCommand extends Command
        $this->seedMerchandiseTypes();
        $this->seedPelletTypes();
        $this->seedBuildings();
+        $this->entityManager->flush();
+
+        $this->seedBuildingInfrastructure();
+        $this->entityManager->flush();
+
+        $this->seedBovines($io);
        $this->seedReceptionTypes();
+        $this->seedBovineTypes();
+        $this->seedShipmentTypes();
        $this->seedSuppliers();
+        $this->entityManager->flush();
+        $this->seedCustomers($io);

        $this->entityManager->flush();

@@ -61,7 +80,7 @@ class SeedCommand extends Command

    private function seedTrucks(): array
    {
-        $trucks  = ['Citerne', 'Porteur'];
+        $trucks  = ['Citerne', 'Porteur', 'Plateau', 'Remorque', 'Benne'];
        $citerne = null;
        $porteur = null;
        foreach ($trucks as $name) {
@@ -161,6 +180,7 @@ class SeedCommand extends Command
            ['label' => 'Foin', 'code' => 'FOIN'],
            ['label' => 'Paille', 'code' => 'PAILLE'],
            ['label' => 'Granule', 'code' => 'GRANULE'],
+            ['label' => 'Autres', 'code' => 'AUTRES'],
        ];
        foreach ($merchandiseTypes as $type) {
            $this->upsertByCode(MerchandiseType::class, $type['code'], static function (MerchandiseType $entity) use ($type) {
@@ -207,6 +227,137 @@ class SeedCommand extends Command
        }
    }

+    private function seedBuildingInfrastructure(): void
+    {
+        $statusByCode = [];
+        $statusRows   = [
+            ['label' => 'Libre', 'code' => 'LB', 'color' => '#A3B18A'],
+            ['label' => 'Occupé', 'code' => 'OC', 'color' => '#3A506B'],
+            ['label' => 'Malade', 'code' => 'ML', 'color' => '#E07A5F'],
+        ];
+        foreach ($statusRows as $statusRow) {
+            /** @var Statut $status */
+            $status = $this->upsertByCode(Statut::class, $statusRow['code'], static function (Statut $entity) use ($statusRow) {
+                $entity
+                    ->setLabel($statusRow['label'])
+                    ->setCode($statusRow['code'])
+                    ->setColor($statusRow['color'])
+                ;
+            });
+            $statusByCode[$statusRow['code']] = $status;
+        }
+
+        $buildingRepo         = $this->entityManager->getRepository(Building::class);
+        $layoutByBuildingCode = [];
+        $layoutRows           = [
+            ['buildingCode' => 'B1', 'name' => 'plan1', 'columns' => 23, 'rows' => 2],
+            ['buildingCode' => 'B2', 'name' => 'plan2', 'columns' => 23, 'rows' => 2],
+            ['buildingCode' => 'B3', 'name' => 'plan3', 'columns' => 23, 'rows' => 2],
+        ];
+        foreach ($layoutRows as $layoutRow) {
+            $building = $buildingRepo->findOneBy(['code' => $layoutRow['buildingCode']]);
+            if (!$building instanceof Building) {
+                continue;
+            }
+
+            /** @var BuildingLayout $layout */
+            $layout = $this->upsertByName(BuildingLayout::class, $layoutRow['name'], static function (BuildingLayout $entity) use ($layoutRow, $building) {
+                $entity
+                    ->setName($layoutRow['name'])
+                    ->setColumns($layoutRow['columns'])
+                    ->setRows($layoutRow['rows'])
+                    ->setIdBuilding($building)
+                ;
+            });
+            $layoutByBuildingCode[$layoutRow['buildingCode']] = $layout;
+        }
+
+        $caseRows = [
+            ['buildingCode' => 'B1', 'from' => 1, 'to' => 12, 'status' => 'LB'],
+            ['buildingCode' => 'B1', 'from' => 13, 'to' => 24, 'status' => 'OC'],
+            ['buildingCode' => 'B1', 'from' => 25, 'to' => 32, 'status' => 'ML'],
+            ['buildingCode' => 'B1', 'from' => 33, 'to' => 44, 'status' => 'LB'],
+            ['buildingCode' => 'B2', 'from' => 1, 'to' => 10, 'status' => 'OC'],
+            ['buildingCode' => 'B2', 'from' => 11, 'to' => 22, 'status' => 'LB'],
+            ['buildingCode' => 'B2', 'from' => 23, 'to' => 30, 'status' => 'ML'],
+            ['buildingCode' => 'B2', 'from' => 31, 'to' => 44, 'status' => 'OC'],
+            ['buildingCode' => 'B3', 'from' => 1, 'to' => 8, 'status' => 'ML'],
+            ['buildingCode' => 'B3', 'from' => 9, 'to' => 20, 'status' => 'LB'],
+            ['buildingCode' => 'B3', 'from' => 21, 'to' => 34, 'status' => 'OC'],
+            ['buildingCode' => 'B3', 'from' => 35, 'to' => 44, 'status' => 'ML'],
+        ];
+
+        $caseByCode = [];
+        foreach ($caseRows as $caseRow) {
+            $building = $buildingRepo->findOneBy(['code' => $caseRow['buildingCode']]);
+            $status   = $statusByCode[$caseRow['status']] ?? null;
+            if (!$building instanceof Building || !$status instanceof Statut) {
+                continue;
+            }
+
+            for ($caseNumber = $caseRow['from']; $caseNumber <= $caseRow['to']; ++$caseNumber) {
+                $code = sprintf('%s-C%d', $caseRow['buildingCode'], $caseNumber);
+
+                /** @var BuildingCase $buildingCase */
+                $buildingCase = $this->upsertByCode(BuildingCase::class, $code, static function (BuildingCase $entity) use ($code, $caseNumber, $building, $status) {
+                    $entity
+                        ->setCode($code)
+                        ->setCaseNumber($caseNumber)
+                        ->setCapacity(15)
+                        ->setIdBuilding($building)
+                        ->setStatut($status)
+                    ;
+                });
+                $caseByCode[$code] = $buildingCase;
+            }
+        }
+
+        $slots        = $this->buildSlotMap();
+        $positionRepo = $this->entityManager->getRepository(BuildingCasePosition::class);
+
+        foreach (['B1' => 'plan1', 'B2' => 'plan2', 'B3' => 'plan3'] as $buildingCode => $layoutName) {
+            $layout = $layoutByBuildingCode[$buildingCode] ?? null;
+            if (!$layout instanceof BuildingLayout || $layout->getName() !== $layoutName) {
+                continue;
+            }
+
+            foreach ($slots as $slot) {
+                $caseCode     = sprintf('%s-C%d', $buildingCode, $slot['caseNumber']);
+                $buildingCase = $caseByCode[$caseCode] ?? null;
+                if (!$buildingCase instanceof BuildingCase) {
+                    continue;
+                }
+
+                $position = $positionRepo->findOneBy([
+                    'buildingLayout' => $layout,
+                    'buildingCase'   => $buildingCase,
+                    'x'              => $slot['x'],
+                    'y'              => $slot['y'],
+                ]);
+
+                if ($position instanceof BuildingCasePosition) {
+                    ++$this->updated;
+
+                    continue;
+                }
+
+                $position = new BuildingCasePosition();
+                $position
+                    ->setX($slot['x'])
+                    ->setY($slot['y'])
+                    ->setW($slot['w'])
+                    ->setH($slot['h'])
+                    ->setRenderOrder((string) $slot['renderOrder'])
+                    ->setBuildingLayout($layout)
+                    ->setBuildingCase($buildingCase)
+                ;
+
+                ++$this->created;
+                $this->entityManager->persist($position);
+            }
+        }
+    }
+
    private function seedReceptionTypes(): void
    {
        $receptionTypes = [
@@ -223,6 +374,167 @@ class SeedCommand extends Command
        }
    }

+    private function seedBovines(SymfonyStyle $io): void
+    {
+        $rows = [
+            [1, 15, '7979580026', 390, '2026-02-25'],
+            [5, 113, '4405604924', 397, '2025-05-22'],
+            [4, 113, '4405604944', 375, '2025-05-22'],
+            [2, 113, '4963291114', 319, '2025-05-22'],
+            [3, 113, '4405604922', 386, '2025-05-22'],
+            [6, 126, '4415811026', 367, '2025-07-02'],
+            [7, 126, '4950971149', 398, '2025-07-02'],
+            [8, 126, '4950971170', 386, '2025-07-02'],
+            [9, 126, '4489751630', 408, '2025-07-02'],
+            [10, 126, '8551323003', 478, '2025-07-02'],
+            [11, 126, '8503833703', 378, '2025-07-02'],
+            [12, 126, '4402104572', 379, '2025-07-02'],
+            [13, 126, '4402104580', 465, '2025-07-02'],
+            [14, 126, '4402104607', 381, '2025-07-02'],
+            [15, 126, '8504059581', 446, '2025-07-02'],
+            [16, 124, '4950971161', 382, '2025-07-02'],
+            [17, 124, '5652911499', 376, '2025-07-02'],
+            [18, 124, '8551323029', 414, '2025-07-02'],
+            [19, 124, '4402104590', 474, '2025-07-02'],
+            [20, 124, '4402104594', 408, '2025-07-02'],
+            [21, 124, '4402104595', 399, '2025-07-02'],
+            [22, 124, '4402104604', 374, '2025-07-02'],
+            [23, 124, '8504059579', 403, '2025-07-02'],
+            [24, 124, '8504059590', 398, '2025-07-02'],
+            [25, 123, '8551782070', 395, '2025-07-02'],
+            [26, 123, '8551782080', 443, '2025-07-02'],
+            [27, 123, '8551782084', 394, '2025-07-02'],
+            [28, 123, '8551782090', 378, '2025-07-02'],
+            [29, 123, '8551782092', 424, '2025-07-02'],
+            [30, 123, '8551782094', 389, '2025-07-02'],
+            [31, 123, '8551782099', 411, '2025-07-02'],
+            [32, 123, '8551323020', 392, '2025-07-02'],
+            [33, 123, '8551323051', 371, '2025-07-02'],
+            [34, 123, '7947673148', 378, '2025-07-02'],
+            [39, 114, '1731177447', 395, '2025-06-19'],
+            [42, 114, '1726167608', 299, '2025-06-19'],
+            [38, 114, '1731177442', 343, '2025-06-19'],
+            [40, 114, '1731177448', 362, '2025-06-19'],
+            [41, 114, '1731177458', 359, '2025-06-19'],
+            [35, 114, '7946282100', 291, '2025-06-19'],
+            [43, 114, '1726167613', 339, '2025-06-19'],
+            [37, 114, '1731177427', 375, '2025-06-19'],
+            [36, 114, '7946282103', 354, '2025-06-19'],
+        ];
+
+        $bovineRepo = $this->entityManager->getRepository(Bovine::class);
+        $caseRepo   = $this->entityManager->getRepository(BuildingCase::class);
+
+        foreach ($rows as [, $legacyCaseId, $nationalNumber, $receivedWeight, $arrivalDate]) {
+            $buildingCase = $this->resolveBuildingCaseByLegacyId((int) $legacyCaseId);
+            if (!$buildingCase instanceof BuildingCase) {
+                $buildingCase = $caseRepo->find((int) $legacyCaseId);
+            }
+            if (!$buildingCase instanceof BuildingCase) {
+                $io->warning(sprintf(
+                    'Bovine %s skipped: building_case token %d not found.',
+                    $nationalNumber,
+                    $legacyCaseId
+                ));
+
+                continue;
+            }
+
+            $bovine = $bovineRepo->findOneBy(['nationalNumber' => $nationalNumber]);
+            if (!$bovine instanceof Bovine) {
+                $bovine = new Bovine();
+                ++$this->created;
+            } else {
+                ++$this->updated;
+            }
+
+            $bovine
+                ->setNationalNumber((string) $nationalNumber)
+                ->setBuildingCase($buildingCase)
+                ->setReceivedWeight((int) $receivedWeight)
+                ->setArrivalDate(new DateTimeImmutable((string) $arrivalDate))
+            ;
+
+            $this->entityManager->persist($bovine);
+        }
+    }
+
+    /**
+     * @return array<int, array{x:int,y:int,w:int,h:int,renderOrder:int,caseNumber:int}>
+     */
+    private function buildSlotMap(): array
+    {
+        $slots = [];
+
+        for ($column = 1; $column <= 12; ++$column) {
+            $slots[] = ['x' => $column, 'y' => 1, 'w' => 1, 'h' => 1, 'renderOrder' => $column, 'caseNumber' => $column + 12];
+        }
+        for ($column = 14; $column <= 23; ++$column) {
+            $slots[] = ['x' => $column, 'y' => 1, 'w' => 1, 'h' => 1, 'renderOrder' => $column - 1, 'caseNumber' => $column + 11];
+        }
+        for ($column = 1; $column <= 12; ++$column) {
+            $slots[] = ['x' => $column, 'y' => 2, 'w' => 1, 'h' => 1, 'renderOrder' => 22 + $column, 'caseNumber' => 13 - $column];
+        }
+        for ($column = 14; $column <= 23; ++$column) {
+            $slots[] = ['x' => $column, 'y' => 2, 'w' => 1, 'h' => 1, 'renderOrder' => 21 + $column, 'caseNumber' => 58 - $column];
+        }
+
+        return $slots;
+    }
+
+    private function resolveBuildingCaseByLegacyId(int $legacyCaseId): ?BuildingCase
+    {
+        if ($legacyCaseId < 1) {
+            return null;
+        }
+
+        $buildingNumber = intdiv($legacyCaseId - 1, 44) + 1;
+        $caseNumber     = (($legacyCaseId - 1) % 44) + 1;
+
+        if ($buildingNumber < 1 || $buildingNumber > 3) {
+            return null;
+        }
+
+        $code = sprintf('B%d-C%d', $buildingNumber, $caseNumber);
+
+        $buildingCase = $this->entityManager->getRepository(BuildingCase::class)->findOneBy(['code' => $code]);
+
+        return $buildingCase instanceof BuildingCase ? $buildingCase : null;
+    }
+
+    private function seedBovineTypes(): void
+    {
+        $bovineTypes = [
+            ['label' => 'Limousine', 'code' => '34'],
+            ['label' => 'Charolaise', 'code' => '38'],
+            ['label' => 'Parthenaise', 'code' => '71'],
+        ];
+        foreach ($bovineTypes as $type) {
+            $this->upsertByCode(BovineType::class, $type['code'], static function (BovineType $entity) use ($type) {
+                $entity
+                    ->setLabel($type['label'])
+                    ->setCode($type['code'])
+                ;
+            });
+        }
+    }
+
+    private function seedShipmentTypes(): void
+    {
+        $shipmentTypes = [
+            ['label' => 'Boucherie', 'code' => 'BDB'],
+            ['label' => 'Équarrissage', 'code' => 'BE'],
+        ];
+        foreach ($shipmentTypes as $type) {
+            $this->upsertByCode(ShipmentType::class, $type['code'], static function (ShipmentType $entity) use ($type) {
+                $entity
+                    ->setLabel($type['label'])
+                    ->setCode($type['code'])
+                ;
+            });
+        }
+    }
+
    private function seedSuppliers(): void
    {
        $suppliers = [
@@ -458,6 +770,130 @@ class SeedCommand extends Command
        }
    }

+    private function seedCustomers(SymfonyStyle $io): void
+    {
+        $addressRepo = $this->entityManager->getRepository(Address::class);
+        $customers   = [
+            [
+                'name'      => 'ARNAULT EURL',
+                'phone'     => '05.49.02.65.27',
+                'email'     => 'eurl.arnault86@orange.fr',
+                'addresses' => [
+                    [
+                        'label'       => 'ARNAULT EURL',
+                        'street'      => 'Moulin du Guéret',
+                        'street2'     => 'B.P 30425',
+                        'postalCode'  => '86100',
+                        'city'        => 'Antran',
+                        'countryCode' => 'FR',
+                    ],
+                ],
+            ],
+            [
+                'name'      => 'COVILIM',
+                'phone'     => '05.55.30.03.10',
+                'email'     => 'sandra.robineaux@covilim.com',
+                'addresses' => [
+                    [
+                        'label'       => 'COVILIM',
+                        'street'      => 'Rue de Nexon',
+                        'street2'     => null,
+                        'postalCode'  => '87000',
+                        'city'        => 'LIMOGES',
+                        'countryCode' => 'FR',
+                    ],
+                ],
+            ],
+            [
+                'name'      => 'Les producteurs de la marche (LPM)',
+                'phone'     => '05.55.63.04.53',
+                'email'     => 'f.legalliard@lpmcoop.fr',
+                'addresses' => [
+                    [
+                        'label'       => 'Les producteurs de la marche (LPM)',
+                        'street'      => 'Malonze',
+                        'street2'     => null,
+                        'postalCode'  => '23300',
+                        'city'        => 'LA SOUTERRAINE',
+                        'countryCode' => 'FR',
+                    ],
+                ],
+            ],
+            [
+                'name'      => 'LORTHOLARY BETAIL',
+                'phone'     => '05.49.52.77.10',
+                'email'     => 'contact86@lortholarybetail.com',
+                'addresses' => [
+                    [
+                        'label'       => 'LORTHOLARY BETAIL',
+                        'street'      => 'FERME DE GENIEC',
+                        'street2'     => null,
+                        'postalCode'  => '86550',
+                        'city'        => 'MIGNALOUX BEAUVOIR',
+                        'countryCode' => 'FR',
+                    ],
+                ],
+            ],
+            [
+                'name'      => 'TERRENA',
+                'phone'     => '02.40.98.90.00',
+                'email'     => 'scouillaud@terrena.fr',
+                'addresses' => [
+                    [
+                        'label'       => 'TERRENA',
+                        'street'      => 'LA NOELLE',
+                        'street2'     => 'BP 20199',
+                        'postalCode'  => '44155',
+                        'city'        => 'ANCENIS CEDEX',
+                        'countryCode' => 'FR',
+                    ],
+                ],
+            ],
+        ];
+
+        foreach ($customers as $customerData) {
+            $customerName = $customerData['name'] ?? $customerData['label'] ?? null;
+            if (!$customerName) {
+                $io->warning('Customer skipped: missing "name".');
+
+                continue;
+            }
+            $customer = $this->upsertByName(Customer::class, $customerName, static function (Customer $customer) use ($customerData, $customerName) {
+                $customer
+                    ->setName($customerName)
+                    ->setPhone($customerData['phone'] ?? null)
+                    ->setEmail($customerData['email'] ?? null)
+                ;
+            });
+
+            $addresses = [];
+            if (isset($customerData['addresses']) && is_array($customerData['addresses'])) {
+                foreach ($customerData['addresses'] as $addressData) {
+                    $addresses[] = $this->upsertAddress($addressData);
+                }
+            } else {
+                // Backward compatibility for older seed format with address ids.
+                $addressIds = $customerData['addressIds'] ?? (isset($customerData['addressId']) ? [$customerData['addressId']] : []);
+                foreach ($addressIds as $addressId) {
+                    $address = $addressRepo->find($addressId);
+                    if (!$address instanceof Address) {
+                        $io->warning(sprintf(
+                            'Customer "%s" skipped address id %d: not found.',
+                            $customerName,
+                            $addressId
+                        ));
+
+                        continue;
+                    }
+                    $addresses[] = $address;
+                }
+            }
+
+            $customer->setAddresses($addresses);
+            $this->entityManager->persist($customer);
+        }
+    }
+
    private function upsertByCode(string $entityClass, string $code, callable $apply): object
    {
        $repo   = $this->entityManager->getRepository($entityClass);
--- a/src/DataFixtures/AppFixtures.php
+++ b/src/DataFixtures/AppFixtures.php
@@ -20,7 +20,8 @@ class AppFixtures extends Fixture implements DependentFixtureInterface
        return [
            TransportFixtures::class,
            ReferenceFixtures::class,
-            SupplierFixtures::class,
+            BuildingInfrastructureFixtures::class,
+            BovineFixtures::class,
            UserFixtures::class,
        ];
    }
--- a/src/DataFixtures/BovineFixtures.php
+++ b/src/DataFixtures/BovineFixtures.php
@@ -0,0 +1,120 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\DataFixtures;
+
+use App\Entity\Bovine;
+use App\Entity\BuildingCase;
+use DateTimeImmutable;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+class BovineFixtures extends Fixture implements DependentFixtureInterface
+{
+    public function load(ObjectManager $manager): void
+    {
+        $rows = [
+            [1, 15, '7979580026', 390, '2026-02-25'],
+            [5, 113, '4405604924', 397, '2025-05-22'],
+            [4, 113, '4405604944', 375, '2025-05-22'],
+            [2, 113, '4963291114', 319, '2025-05-22'],
+            [3, 113, '4405604922', 386, '2025-05-22'],
+            [6, 126, '4415811026', 367, '2025-07-02'],
+            [7, 126, '4950971149', 398, '2025-07-02'],
+            [8, 126, '4950971170', 386, '2025-07-02'],
+            [9, 126, '4489751630', 408, '2025-07-02'],
+            [10, 126, '8551323003', 478, '2025-07-02'],
+            [11, 126, '8503833703', 378, '2025-07-02'],
+            [12, 126, '4402104572', 379, '2025-07-02'],
+            [13, 126, '4402104580', 465, '2025-07-02'],
+            [14, 126, '4402104607', 381, '2025-07-02'],
+            [15, 126, '8504059581', 446, '2025-07-02'],
+            [16, 124, '4950971161', 382, '2025-07-02'],
+            [17, 124, '5652911499', 376, '2025-07-02'],
+            [18, 124, '8551323029', 414, '2025-07-02'],
+            [19, 124, '4402104590', 474, '2025-07-02'],
+            [20, 124, '4402104594', 408, '2025-07-02'],
+            [21, 124, '4402104595', 399, '2025-07-02'],
+            [22, 124, '4402104604', 374, '2025-07-02'],
+            [23, 124, '8504059579', 403, '2025-07-02'],
+            [24, 124, '8504059590', 398, '2025-07-02'],
+            [25, 123, '8551782070', 395, '2025-07-02'],
+            [26, 123, '8551782080', 443, '2025-07-02'],
+            [27, 123, '8551782084', 394, '2025-07-02'],
+            [28, 123, '8551782090', 378, '2025-07-02'],
+            [29, 123, '8551782092', 424, '2025-07-02'],
+            [30, 123, '8551782094', 389, '2025-07-02'],
+            [31, 123, '8551782099', 411, '2025-07-02'],
+            [32, 123, '8551323020', 392, '2025-07-02'],
+            [33, 123, '8551323051', 371, '2025-07-02'],
+            [34, 123, '7947673148', 378, '2025-07-02'],
+            [39, 114, '1731177447', 395, '2025-06-19'],
+            [42, 114, '1726167608', 299, '2025-06-19'],
+            [38, 114, '1731177442', 343, '2025-06-19'],
+            [40, 114, '1731177448', 362, '2025-06-19'],
+            [41, 114, '1731177458', 359, '2025-06-19'],
+            [35, 114, '7946282100', 291, '2025-06-19'],
+            [43, 114, '1726167613', 339, '2025-06-19'],
+            [37, 114, '1731177427', 375, '2025-06-19'],
+            [36, 114, '7946282103', 354, '2025-06-19'],
+        ];
+
+        $bovineRepository = $manager->getRepository(Bovine::class);
+        $caseRepository   = $manager->getRepository(BuildingCase::class);
+
+        foreach ($rows as [, $legacyCaseId, $nationalNumber, $receivedWeight, $arrivalDate]) {
+            $buildingCase = $this->resolveBuildingCaseByLegacyId($manager, (int) $legacyCaseId);
+            if (!$buildingCase instanceof BuildingCase) {
+                $buildingCase = $caseRepository->find((int) $legacyCaseId);
+            }
+            if (!$buildingCase instanceof BuildingCase) {
+                continue;
+            }
+
+            /** @var null|Bovine $bovine */
+            $bovine = $bovineRepository->findOneBy(['nationalNumber' => (string) $nationalNumber]);
+            if (!$bovine instanceof Bovine) {
+                $bovine = new Bovine();
+            }
+
+            $bovine
+                ->setNationalNumber((string) $nationalNumber)
+                ->setBuildingCase($buildingCase)
+                ->setReceivedWeight((int) $receivedWeight)
+                ->setArrivalDate(new DateTimeImmutable((string) $arrivalDate))
+            ;
+
+            $manager->persist($bovine);
+        }
+
+        $manager->flush();
+    }
+
+    public function getDependencies(): array
+    {
+        return [
+            BuildingInfrastructureFixtures::class,
+        ];
+    }
+
+    private function resolveBuildingCaseByLegacyId(ObjectManager $manager, int $legacyCaseId): ?BuildingCase
+    {
+        if ($legacyCaseId < 1) {
+            return null;
+        }
+
+        $buildingNumber = intdiv($legacyCaseId - 1, 44) + 1;
+        $caseNumber     = (($legacyCaseId - 1) % 44) + 1;
+
+        if ($buildingNumber < 1 || $buildingNumber > 3) {
+            return null;
+        }
+
+        $code         = sprintf('B%d-C%d', $buildingNumber, $caseNumber);
+        $buildingCase = $manager->getRepository(BuildingCase::class)->findOneBy(['code' => $code]);
+
+        return $buildingCase instanceof BuildingCase ? $buildingCase : null;
+    }
+}
--- a/src/DataFixtures/BuildingInfrastructureFixtures.php
+++ b/src/DataFixtures/BuildingInfrastructureFixtures.php
@@ -0,0 +1,299 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\DataFixtures;
+
+use App\Entity\Building;
+use App\Entity\BuildingCase;
+use App\Entity\BuildingCasePosition;
+use App\Entity\BuildingLayout;
+use App\Entity\Statut;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use RuntimeException;
+
+class BuildingInfrastructureFixtures extends Fixture implements DependentFixtureInterface
+{
+    public function load(ObjectManager $manager): void
+    {
+        $statuts   = $this->loadStatuts($manager);
+        $buildings = $this->getBuildingsByCode($manager, ['B1', 'B2', 'B3']);
+        $layouts   = $this->loadLayouts($manager, $buildings);
+        $cases     = $this->loadBuildingCases($manager, $buildings, $statuts);
+        $this->loadCasePositions($manager, $layouts, $cases);
+
+        $manager->flush();
+    }
+
+    public function getDependencies(): array
+    {
+        return [
+            ReferenceFixtures::class,
+        ];
+    }
+
+    /**
+     * @return array<string, Statut>
+     */
+    private function loadStatuts(ObjectManager $manager): array
+    {
+        $repo = $manager->getRepository(Statut::class);
+
+        $data = [
+            ['label' => 'Libre', 'code' => 'LB', 'color' => '#A3B18A'],
+            ['label' => 'Occupé', 'code' => 'OC', 'color' => '#3A506B'],
+            ['label' => 'Malade', 'code' => 'ML', 'color' => '#E07A5F'],
+        ];
+
+        $result = [];
+        foreach ($data as $row) {
+            /** @var null|Statut $statut */
+            $statut = $repo->findOneBy(['code' => $row['code']]);
+            if (!$statut instanceof Statut) {
+                $statut = new Statut()
+                    ->setLabel($row['label'])
+                    ->setCode($row['code'])
+                    ->setColor($row['color'])
+                ;
+                $manager->persist($statut);
+            }
+
+            $result[$row['code']] = $statut;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param list<string> $codes
+     *
+     * @return array<string, Building>
+     */
+    private function getBuildingsByCode(ObjectManager $manager, array $codes): array
+    {
+        $repo   = $manager->getRepository(Building::class);
+        $result = [];
+
+        foreach ($codes as $code) {
+            /** @var null|Building $building */
+            $building = $repo->findOneBy(['code' => $code]);
+            if (!$building instanceof Building) {
+                throw new RuntimeException(sprintf('Building "%s" not found. Load ReferenceFixtures first.', $code));
+            }
+
+            $result[$code] = $building;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param array<string, Building> $buildings
+     *
+     * @return array<string, BuildingLayout>
+     */
+    private function loadLayouts(ObjectManager $manager, array $buildings): array
+    {
+        $repo = $manager->getRepository(BuildingLayout::class);
+
+        $data = [
+            ['name' => 'plan1', 'columns' => 23, 'rows' => 2, 'buildingCode' => 'B1'],
+            ['name' => 'plan2', 'columns' => 23, 'rows' => 2, 'buildingCode' => 'B2'],
+            ['name' => 'plan3', 'columns' => 23, 'rows' => 2, 'buildingCode' => 'B3'],
+        ];
+
+        $result = [];
+        foreach ($data as $row) {
+            /** @var null|BuildingLayout $layout */
+            $layout = $repo->findOneBy(['name' => $row['name']]);
+            if (!$layout instanceof BuildingLayout) {
+                $layout = new BuildingLayout()
+                    ->setName($row['name'])
+                    ->setColumns($row['columns'])
+                    ->setRows($row['rows'])
+                    ->setIdBuilding($buildings[$row['buildingCode']])
+                ;
+                $manager->persist($layout);
+            }
+
+            $result[$row['buildingCode']] = $layout;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param array<string, Building> $buildings
+     * @param array<string, Statut>   $statuts
+     *
+     * @return array<string, BuildingCase>
+     */
+    private function loadBuildingCases(ObjectManager $manager, array $buildings, array $statuts): array
+    {
+        $repo = $manager->getRepository(BuildingCase::class);
+
+        $statusRanges = [
+            // B1
+            ['buildingCode' => 'B1', 'from' => 1, 'to' => 12, 'statut' => 'LB'],
+            ['buildingCode' => 'B1', 'from' => 13, 'to' => 24, 'statut' => 'OC'],
+            ['buildingCode' => 'B1', 'from' => 25, 'to' => 32, 'statut' => 'ML'],
+            ['buildingCode' => 'B1', 'from' => 33, 'to' => 44, 'statut' => 'LB'],
+            // B2
+            ['buildingCode' => 'B2', 'from' => 1, 'to' => 10, 'statut' => 'OC'],
+            ['buildingCode' => 'B2', 'from' => 11, 'to' => 22, 'statut' => 'LB'],
+            ['buildingCode' => 'B2', 'from' => 23, 'to' => 30, 'statut' => 'ML'],
+            ['buildingCode' => 'B2', 'from' => 31, 'to' => 44, 'statut' => 'OC'],
+            // B3
+            ['buildingCode' => 'B3', 'from' => 1, 'to' => 8, 'statut' => 'ML'],
+            ['buildingCode' => 'B3', 'from' => 9, 'to' => 20, 'statut' => 'LB'],
+            ['buildingCode' => 'B3', 'from' => 21, 'to' => 34, 'statut' => 'OC'],
+            ['buildingCode' => 'B3', 'from' => 35, 'to' => 44, 'statut' => 'ML'],
+        ];
+
+        $result = [];
+        foreach ($statusRanges as $range) {
+            for ($caseNumber = $range['from']; $caseNumber <= $range['to']; ++$caseNumber) {
+                $code = sprintf('%s-C%d', $range['buildingCode'], $caseNumber);
+
+                if (isset($result[$code])) {
+                    continue;
+                }
+
+                /** @var null|BuildingCase $buildingCase */
+                $buildingCase = $repo->findOneBy(['code' => $code]);
+                if (!$buildingCase instanceof BuildingCase) {
+                    $buildingCase = new BuildingCase()
+                        ->setCaseNumber($caseNumber)
+                        ->setCode($code)
+                        ->setCapacity(15)
+                        ->setIdBuilding($buildings[$range['buildingCode']])
+                        ->setStatut($statuts[$range['statut']])
+                    ;
+                    $manager->persist($buildingCase);
+                }
+
+                $result[$code] = $buildingCase;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param array<string, BuildingLayout> $layouts
+     * @param array<string, BuildingCase>   $casesByCode
+     */
+    private function loadCasePositions(ObjectManager $manager, array $layouts, array $casesByCode): void
+    {
+        $repo = $manager->getRepository(BuildingCasePosition::class);
+
+        $layoutMap = [
+            'B1' => 'plan1',
+            'B2' => 'plan2',
+            'B3' => 'plan3',
+        ];
+
+        $slots = $this->buildSlotMap();
+
+        foreach ($layoutMap as $buildingCode => $layoutName) {
+            $layout = $layouts[$buildingCode] ?? null;
+            if (!$layout instanceof BuildingLayout || $layout->getName() !== $layoutName) {
+                throw new RuntimeException(sprintf('Layout "%s" for building "%s" not found.', $layoutName, $buildingCode));
+            }
+
+            foreach ($slots as $slot) {
+                $caseCode     = sprintf('%s-C%d', $buildingCode, $slot['caseNumber']);
+                $buildingCase = $casesByCode[$caseCode] ?? null;
+
+                if (!$buildingCase instanceof BuildingCase) {
+                    throw new RuntimeException(sprintf('Building case "%s" not found.', $caseCode));
+                }
+
+                /** @var null|BuildingCasePosition $position */
+                $position = $repo->findOneBy([
+                    'buildingLayout' => $layout,
+                    'buildingCase'   => $buildingCase,
+                    'x'              => $slot['x'],
+                    'y'              => $slot['y'],
+                ]);
+
+                if ($position instanceof BuildingCasePosition) {
+                    continue;
+                }
+
+                $position = new BuildingCasePosition()
+                    ->setX($slot['x'])
+                    ->setY($slot['y'])
+                    ->setW($slot['w'])
+                    ->setH($slot['h'])
+                    ->setRenderOrder((string) $slot['renderOrder'])
+                    ->setBuildingLayout($layout)
+                    ->setBuildingCase($buildingCase)
+                ;
+                $manager->persist($position);
+            }
+        }
+    }
+
+    /**
+     * Reproduit le slot_map SQL (44 emplacements sur 2 lignes avec un gap en colonne 13).
+     *
+     * @return list<array{x:int,y:int,w:int,h:int,renderOrder:int,caseNumber:int}>
+     */
+    private function buildSlotMap(): array
+    {
+        $slots = [];
+
+        // Ligne 1, colonnes 1..12 => cases 13..24
+        for ($c = 1; $c <= 12; ++$c) {
+            $slots[] = [
+                'x'           => $c,
+                'y'           => 1,
+                'w'           => 1,
+                'h'           => 1,
+                'renderOrder' => $c,
+                'caseNumber'  => $c + 12,
+            ];
+        }
+
+        // Ligne 1, colonnes 14..23 => cases 25..34
+        for ($c = 14; $c <= 23; ++$c) {
+            $slots[] = [
+                'x'           => $c,
+                'y'           => 1,
+                'w'           => 1,
+                'h'           => 1,
+                'renderOrder' => $c - 1,
+                'caseNumber'  => $c + 11,
+            ];
+        }
+
+        // Ligne 2, colonnes 1..12 => cases 12..1
+        for ($c = 1; $c <= 12; ++$c) {
+            $slots[] = [
+                'x'           => $c,
+                'y'           => 2,
+                'w'           => 1,
+                'h'           => 1,
+                'renderOrder' => 22 + $c,
+                'caseNumber'  => 13 - $c,
+            ];
+        }
+
+        // Ligne 2, colonnes 14..23 => cases 44..35
+        for ($c = 14; $c <= 23; ++$c) {
+            $slots[] = [
+                'x'           => $c,
+                'y'           => 2,
+                'w'           => 1,
+                'h'           => 1,
+                'renderOrder' => 21 + $c,
+                'caseNumber'  => 58 - $c,
+            ];
+        }
+
+        return $slots;
+    }
+}
--- a/src/DataFixtures/ReferenceFixtures.php
+++ b/src/DataFixtures/ReferenceFixtures.php
@@ -5,10 +5,13 @@ declare(strict_types=1);
 namespace App\DataFixtures;

 use App\Entity\Address;
+use App\Entity\BovineType;
 use App\Entity\Building;
+use App\Entity\Customer;
 use App\Entity\MerchandiseType;
 use App\Entity\PelletType;
 use App\Entity\ReceptionType;
+use App\Entity\ShipmentType;
 use App\Entity\Supplier;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
@@ -17,10 +20,13 @@ class ReferenceFixtures extends Fixture
 {
    public function load(ObjectManager $manager): void
    {
+        $addressIndex = [];
+
        $merchandiseTypes = [
            ['label' => 'Foin', 'code' => 'FOIN'],
            ['label' => 'Paille', 'code' => 'PAILLE'],
            ['label' => 'Granule', 'code' => 'GRANULE'],
+            ['label' => 'Autres', 'code' => 'AUTRES'],
        ];
        foreach ($merchandiseTypes as $type) {
            $merchandiseType = new MerchandiseType()
@@ -69,6 +75,31 @@ class ReferenceFixtures extends Fixture
            $manager->persist($receptionType);
        }

+        $bovineTypes = [
+            ['label' => 'Limousine', 'code' => '34'],
+            ['label' => 'Charolaise', 'code' => '38'],
+            ['label' => 'Parthenaise', 'code' => '71'],
+        ];
+        foreach ($bovineTypes as $type) {
+            $bovineType = new BovineType()
+                ->setLabel($type['label'])
+                ->setCode($type['code'])
+            ;
+            $manager->persist($bovineType);
+        }
+
+        $shipmentTypes = [
+            ['label' => 'Bovin de boucherie', 'code' => 'BDB'],
+            ['label' => "Bovin d'équarrissage", 'code' => 'BE'],
+        ];
+        foreach ($shipmentTypes as $type) {
+            $shipmentType = new ShipmentType()
+                ->setLabel($type['label'])
+                ->setCode($type['code'])
+            ;
+            $manager->persist($shipmentType);
+        }
+
        $suppliers = [
            [
                'name'      => 'LIOT',
@@ -290,21 +321,129 @@ class ReferenceFixtures extends Fixture
            ;

            foreach ($supplierData['addresses'] as $addressData) {
-                $address = new Address()
-                    ->setLabel($addressData['label'])
-                    ->setStreet($addressData['street'])
-                    ->setStreet2($addressData['street2'])
-                    ->setPostalCode($addressData['postalCode'])
-                    ->setCity($addressData['city'])
-                    ->setCountryCode($addressData['countryCode'])
-                ;
-                $manager->persist($address);
+                $addressKey = sprintf('%s|%s', $addressData['label'], $addressData['postalCode']);
+                if (!isset($addressIndex[$addressKey])) {
+                    $addressIndex[$addressKey] = new Address()
+                        ->setLabel($addressData['label'])
+                        ->setStreet($addressData['street'])
+                        ->setStreet2($addressData['street2'])
+                        ->setPostalCode($addressData['postalCode'])
+                        ->setCity($addressData['city'])
+                        ->setCountryCode($addressData['countryCode'])
+                    ;
+                    $manager->persist($addressIndex[$addressKey]);
+                }
+                $address = $addressIndex[$addressKey];
                $supplier->getAddresses()->add($address);
            }

            $manager->persist($supplier);
        }

+        $customers = [
+            [
+                'name'      => 'ARNAULT EURL',
+                'phone'     => '05.49.02.65.27',
+                'email'     => 'eurl.arnault86@orange.fr',
+                'addresses' => [
+                    [
+                        'label'       => 'ARNAULT EURL',
+                        'street'      => 'Moulin du Guéret',
+                        'street2'     => 'B.P 30425',
+                        'postalCode'  => '86100',
+                        'city'        => 'Antran',
+                        'countryCode' => 'FR',
+                    ],
+                ],
+            ],
+            [
+                'name'      => 'COVILIM',
+                'phone'     => '05.55.30.03.10',
+                'email'     => 'sandra.robineaux@covilim.com',
+                'addresses' => [
+                    [
+                        'label'       => 'COVILIM',
+                        'street'      => 'Rue de Nexon',
+                        'street2'     => null,
+                        'postalCode'  => '87000',
+                        'city'        => 'LIMOGES',
+                        'countryCode' => 'FR',
+                    ],
+                ],
+            ],
+            [
+                'name'      => 'Les producteurs de la marche (LPM)',
+                'phone'     => '05.55.63.04.53',
+                'email'     => 'f.legalliard@lpmcoop.fr',
+                'addresses' => [
+                    [
+                        'label'       => 'Les producteurs de la marche (LPM)',
+                        'street'      => 'Malonze',
+                        'street2'     => null,
+                        'postalCode'  => '23300',
+                        'city'        => 'LA SOUTERRAINE',
+                        'countryCode' => 'FR',
+                    ],
+                ],
+            ],
+            [
+                'name'      => 'LORTHOLARY BETAIL',
+                'phone'     => '05.49.52.77.10',
+                'email'     => 'contact86@lortholarybetail.com',
+                'addresses' => [
+                    [
+                        'label'       => 'LORTHOLARY BETAIL',
+                        'street'      => 'FERME DE GENIEC',
+                        'street2'     => null,
+                        'postalCode'  => '86550',
+                        'city'        => 'MIGNALOUX BEAUVOIR',
+                        'countryCode' => 'FR',
+                    ],
+                ],
+            ],
+            [
+                'name'      => 'TERRENA',
+                'phone'     => '02.40.98.90.00',
+                'email'     => 'scouillaud@terrena.fr',
+                'addresses' => [
+                    [
+                        'label'       => 'TERRENA',
+                        'street'      => 'LA NOELLE',
+                        'street2'     => 'BP 20199',
+                        'postalCode'  => '44155',
+                        'city'        => 'ANCENIS CEDEX',
+                        'countryCode' => 'FR',
+                    ],
+                ],
+            ],
+        ];
+
+        foreach ($customers as $customerData) {
+            $customer = new Customer()
+                ->setName($customerData['name'])
+                ->setPhone($customerData['phone'])
+                ->setEmail($customerData['email'])
+            ;
+
+            foreach ($customerData['addresses'] as $addressData) {
+                $addressKey = sprintf('%s|%s', $addressData['label'], $addressData['postalCode']);
+                if (!isset($addressIndex[$addressKey])) {
+                    $addressIndex[$addressKey] = new Address()
+                        ->setLabel($addressData['label'])
+                        ->setStreet($addressData['street'])
+                        ->setStreet2($addressData['street2'])
+                        ->setPostalCode($addressData['postalCode'])
+                        ->setCity($addressData['city'])
+                        ->setCountryCode($addressData['countryCode'])
+                    ;
+                    $manager->persist($addressIndex[$addressKey]);
+                }
+                $customer->getAddresses()->add($addressIndex[$addressKey]);
+            }
+
+            $manager->persist($customer);
+        }
+
        $manager->flush();
    }
 }
--- a/src/DataFixtures/SupplierFixtures.php
+++ b/src/DataFixtures/SupplierFixtures.php
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\DataFixtures;
-
-use App\Entity\Address;
-use App\Entity\Supplier;
-use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Persistence\ObjectManager;
-
-class SupplierFixtures extends Fixture
-{
-    public function load(ObjectManager $manager): void
-    {
-        $address = new Address()
-            ->setLabel('LIOT CHATELLERAULT')
-            ->setStreet("14 Allée d'Argenson")
-            ->setStreet2('ZI Nord')
-            ->setPostalCode('86100')
-            ->setCity('CHATELLERAULT')
-            ->setCountryCode('FR')
-        ;
-
-        $supplier = new Supplier()
-            ->setName('LIOT')
-            ->setEmail('lpc.contacts@lpc-liot.fr')
-            ->setPhone('05.49.20.09.10')
-        ;
-
-        $supplier->getAddresses()->add($address);
-
-        $manager->persist($address);
-        $manager->persist($supplier);
-
-        $manager->flush();
-    }
-}
--- a/src/DataFixtures/TransportFixtures.php
+++ b/src/DataFixtures/TransportFixtures.php
@@ -15,11 +15,17 @@ class TransportFixtures extends Fixture
 {
    public function load(ObjectManager $manager): void
    {
-        $citerne = new Truck()->setName('Citerne');
-        $porteur = new Truck()->setName('Porteur');
+        $citerne  = new Truck()->setName('Citerne');
+        $porteur  = new Truck()->setName('Porteur');
+        $plateau  = new Truck()->setName('Plateau');
+        $remorque = new Truck()->setName('Remorque');
+        $benne    = new Truck()->setName('Benne');

        $manager->persist($citerne);
        $manager->persist($porteur);
+        $manager->persist($plateau);
+        $manager->persist($remorque);
+        $manager->persist($benne);

        $liot = new Carrier()
            ->setName('LIOT')
--- a/src/Entity/BovinShipment.php
+++ b/src/Entity/BovinShipment.php
@@ -1,101 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Entity;
-
-use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
-use ApiPlatform\Metadata\ApiFilter;
-use ApiPlatform\Metadata\ApiProperty;
-use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Metadata\Delete;
-use ApiPlatform\Metadata\Get;
-use ApiPlatform\Metadata\GetCollection;
-use ApiPlatform\Metadata\Patch;
-use ApiPlatform\Metadata\Post;
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Attribute\Groups;
-
-#[ORM\Entity]
-#[ApiFilter(SearchFilter::class, properties: ['shipment' => 'exact'])]
-#[ORM\UniqueConstraint(name: 'uniq_bovin_shipment', columns: ['shipment_id', 'shipment_type_id'])]
-#[ORM\Table(name: 'bovin_shipment')]
-#[ApiResource(
-    operations: [
-        new Get(
-            requirements: ['id' => '\d+'],
-            normalizationContext: ['groups' => ['shipment-bovine:read']],
-        ),
-        new GetCollection(
-            normalizationContext: ['groups' => ['shipment-bovine:read']],
-        ),
-
-        new Post(
-            normalizationContext: ['groups' => ['shipment-bovine:read']],
-            denormalizationContext: ['groups' => ['shipment-bovine:write']],
-        ),
-        new Patch(
-            normalizationContext: ['groups' => ['shipment-bovine:read']],
-            denormalizationContext: ['groups' => ['shipment-bovine:write']],
-        ),
-        new Delete(),
-    ],
-    security: "is_granted('ROLE_USER')",
-)]
-class BovinShipment
-{
-    #[ORM\Id]
-    #[ORM\GeneratedValue]
-    #[ORM\Column]
-    #[Groups(['shipment:read', 'shipment-bovine:read'])]
-    private ?int $id = null;
-
-    #[ORM\ManyToOne(inversedBy: 'bovinShipments')]
-    #[Groups(['shipment-bovine:read', 'shipment-bovine:write'])]
-    #[ApiProperty(readableLink: true)]
-    private ?Shipment $shipment = null;
-
-    #[ORM\ManyToOne]
-    #[Groups(['shipment:read', 'shipment-bovine:write', 'shipment-bovine:read'])]
-    #[ApiProperty(readableLink: true)]
-    private ?ShipmentType $shipmentType = null;
-
-    #[ORM\Column]
-    #[Groups(['shipment:read', 'shipment-bovine:write', 'shipment-bovine:read'])]
-    private ?int $nbBovinSend = null;
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getShipment(): ?Shipment
-    {
-        return $this->shipment;
-    }
-
-    public function setShipment(?Shipment $shipment): void
-    {
-        $this->shipment = $shipment;
-    }
-
-    public function getShipmentType(): ?ShipmentType
-    {
-        return $this->shipmentType;
-    }
-
-    public function setShipmentType(?ShipmentType $shipmentType): void
-    {
-        $this->shipmentType = $shipmentType;
-    }
-
-    public function getNbBovinSend(): ?int
-    {
-        return $this->nbBovinSend;
-    }
-
-    public function setNbBovinSend(?int $nbBovinSend): void
-    {
-        $this->nbBovinSend = $nbBovinSend;
-    }
-}
--- a/src/Entity/Bovine.php
+++ b/src/Entity/Bovine.php
@@ -0,0 +1,121 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\Patch;
+use ApiPlatform\Metadata\Post;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Context;
+use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'bovine')]
+#[ORM\UniqueConstraint(name: 'uniq_bovine_national_number', columns: ['national_number'])]
+#[ApiResource(
+    operations: [
+        new Get(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['bovine:read']],
+        ),
+        new GetCollection(
+            normalizationContext: ['groups' => ['bovine:read']],
+        ),
+        new Post(
+            normalizationContext: ['groups' => ['bovine:read']],
+            denormalizationContext: ['groups' => ['bovine:write']],
+            security: "is_granted('ROLE_ADMIN')",
+        ),
+        new Patch(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['bovine:read']],
+            denormalizationContext: ['groups' => ['bovine:write']],
+            security: "is_granted('ROLE_ADMIN')",
+        ),
+    ],
+    security: "is_granted('ROLE_USER')",
+)]
+class Bovine
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['bovine:read'])]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 50)]
+    #[Groups(['bovine:read', 'bovine:write'])]
+    private string $nationalNumber = '';
+
+    #[ORM\Column(nullable: true)]
+    #[Groups(['bovine:read', 'bovine:write'])]
+    private ?int $receivedWeight = null;
+
+    #[ORM\Column(type: 'date_immutable', nullable: true)]
+    #[Groups(['bovine:read', 'bovine:write'])]
+    #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
+    private ?DateTimeImmutable $arrivalDate = null;
+
+    #[ORM\ManyToOne(inversedBy: 'bovines')]
+    #[Groups(['bovine:read', 'bovine:write'])]
+    private ?BuildingCase $buildingCase = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getNationalNumber(): string
+    {
+        return $this->nationalNumber;
+    }
+
+    public function setNationalNumber(string $nationalNumber): static
+    {
+        $this->nationalNumber = $nationalNumber;
+
+        return $this;
+    }
+
+    public function getReceivedWeight(): ?int
+    {
+        return $this->receivedWeight;
+    }
+
+    public function setReceivedWeight(?int $receivedWeight): static
+    {
+        $this->receivedWeight = $receivedWeight;
+
+        return $this;
+    }
+
+    public function getArrivalDate(): ?DateTimeImmutable
+    {
+        return $this->arrivalDate;
+    }
+
+    public function setArrivalDate(?DateTimeImmutable $arrivalDate): static
+    {
+        $this->arrivalDate = $arrivalDate;
+
+        return $this;
+    }
+
+    public function getBuildingCase(): ?BuildingCase
+    {
+        return $this->buildingCase;
+    }
+
+    public function setBuildingCase(?BuildingCase $buildingCase): static
+    {
+        $this->buildingCase = $buildingCase;
+
+        return $this;
+    }
+}
--- a/src/Entity/BovineType.php
+++ b/src/Entity/BovineType.php
@@ -7,6 +7,8 @@ namespace App\Entity;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\Patch;
+use ApiPlatform\Metadata\Post;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;

@@ -20,6 +22,17 @@ use Symfony\Component\Serializer\Attribute\Groups;
        new GetCollection(
            normalizationContext: ['groups' => ['bovine-type:read']],
        ),
+        new Post(
+            normalizationContext: ['groups' => ['bovine-type:read']],
+            denormalizationContext: ['groups' => ['bovine-type:write']],
+            security: "is_granted('ROLE_ADMIN')",
+        ),
+        new Patch(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['bovine-type:read']],
+            denormalizationContext: ['groups' => ['bovine-type:write']],
+            security: "is_granted('ROLE_ADMIN')",
+        ),
    ],
    security: "is_granted('ROLE_USER')",
 )]
@@ -32,11 +45,11 @@ class BovineType
    private ?int $id = null;

    #[ORM\Column(length: 120)]
-    #[Groups(['bovine-type:read', 'reception:read', 'reception-bovine:read'])]
+    #[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read'])]
    private ?string $label = null;

    #[ORM\Column(length: 50)]
-    #[Groups(['bovine-type:read', 'reception:read', 'reception-bovine:read'])]
+    #[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read'])]
    private ?string $code = null;

    public function getId(): ?int
--- a/src/Entity/Building.php
+++ b/src/Entity/Building.php
@@ -11,6 +11,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Attribute\SerializedName;

 #[ORM\Entity]
 #[ORM\Table(name: 'building')]
@@ -48,9 +49,25 @@ class Building
    #[ORM\ManyToMany(targetEntity: Reception::class, mappedBy: 'buildings')]
    private Collection $receptions;

+    /**
+     * @var Collection<int, BuildingCase>
+     */
+    #[ORM\OneToMany(targetEntity: BuildingCase::class, mappedBy: 'id_building')]
+    private Collection $buildingCases;
+
+    /**
+     * @var Collection<int, BuildingLayout>
+     */
+    #[ORM\OneToMany(targetEntity: BuildingLayout::class, mappedBy: 'id_building')]
+    #[Groups(['building:read'])]
+    #[SerializedName('layouts')]
+    private Collection $buildingLayout;
+
    public function __construct()
    {
-        $this->receptions = new ArrayCollection();
+        $this->receptions     = new ArrayCollection();
+        $this->buildingCases  = new ArrayCollection();
+        $this->buildingLayout = new ArrayCollection();
    }

    public function getId(): ?int
@@ -89,4 +106,41 @@ class Building
    {
        return $this->receptions;
    }
+
+    /**
+     * @return Collection<int, BuildingCase>
+     */
+    public function getBuildingCases(): Collection
+    {
+        return $this->buildingCases;
+    }
+
+    public function addBuildingCase(BuildingCase $buildingCase): static
+    {
+        if (!$this->buildingCases->contains($buildingCase)) {
+            $this->buildingCases->add($buildingCase);
+            $buildingCase->setIdBuilding($this);
+        }
+
+        return $this;
+    }
+
+    public function removeBuildingCase(BuildingCase $buildingCase): static
+    {
+        if ($this->buildingCases->removeElement($buildingCase)) {
+            if ($buildingCase->getIdBuilding() === $this) {
+                $buildingCase->setIdBuilding(null);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return Collection<int, BuildingLayout>
+     */
+    public function getBuildingLayout(): Collection
+    {
+        return $this->buildingLayout;
+    }
 }
--- a/src/Entity/BuildingCase.php
+++ b/src/Entity/BuildingCase.php
@@ -0,0 +1,209 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\OpenApi\Model\Operation as OpenApiOperation;
+use App\State\BuildingCaseWeightsReportProvider;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Attribute\SerializedName;
+
+#[ORM\Entity]
+#[ApiResource(
+    operations: [
+        new Get(
+            uriTemplate: '/building_cases/{id}/weights-report',
+            requirements: ['id' => '\d+'],
+            openapi: new OpenApiOperation(
+                summary: 'Render case weights report',
+                description: 'Returns a PDF report of bovines stored in the selected case.',
+            ),
+            output: false,
+            provider: BuildingCaseWeightsReportProvider::class,
+        ),
+    ],
+    security: "is_granted('ROLE_USER')",
+)]
+class BuildingCase
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['building:read'])]
+    private ?int $id = null;
+
+    #[ORM\Column]
+    #[Groups(['building:read'])]
+    #[SerializedName('caseNumber')]
+    private ?int $case_number = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['building:read'])]
+    private ?string $code = null;
+
+    #[ORM\Column]
+    #[Groups(['building:read'])]
+    private ?int $capacity = null;
+
+    /**
+     * @var Collection<int, BuildingCasePosition>
+     */
+    #[ORM\OneToMany(targetEntity: BuildingCasePosition::class, mappedBy: 'buildingCase')]
+    private Collection $id_case_position;
+
+    #[ORM\ManyToOne(inversedBy: 'buildingCases')]
+    private ?Building $id_building = null;
+
+    #[ORM\ManyToOne(inversedBy: 'id_case')]
+    #[Groups(['building:read'])]
+    private ?Statut $statut = null;
+
+    /**
+     * @var Collection<int, Bovine>
+     */
+    #[ORM\OneToMany(targetEntity: Bovine::class, mappedBy: 'buildingCase')]
+    private Collection $bovines;
+
+    public function __construct()
+    {
+        $this->id_case_position = new ArrayCollection();
+        $this->bovines          = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function setId(int $id): static
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    public function getCaseNumber(): ?int
+    {
+        return $this->case_number;
+    }
+
+    public function setCaseNumber(int $case_number): static
+    {
+        $this->case_number = $case_number;
+
+        return $this;
+    }
+
+    public function getCode(): ?string
+    {
+        return $this->code;
+    }
+
+    public function setCode(string $code): static
+    {
+        $this->code = $code;
+
+        return $this;
+    }
+
+    public function getCapacity(): ?int
+    {
+        return $this->capacity;
+    }
+
+    public function setCapacity(int $capacity): static
+    {
+        $this->capacity = $capacity;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection<int, BuildingCasePosition>
+     */
+    public function getIdCasePosition(): Collection
+    {
+        return $this->id_case_position;
+    }
+
+    public function addIdCasePosition(BuildingCasePosition $idCasePosition): static
+    {
+        if (!$this->id_case_position->contains($idCasePosition)) {
+            $this->id_case_position->add($idCasePosition);
+            $idCasePosition->setBuildingCase($this);
+        }
+
+        return $this;
+    }
+
+    public function removeIdCasePosition(BuildingCasePosition $idCasePosition): static
+    {
+        if ($this->id_case_position->removeElement($idCasePosition)) {
+            // set the owning side to null (unless already changed)
+            if ($idCasePosition->getBuildingCase() === $this) {
+                $idCasePosition->setBuildingCase(null);
+            }
+        }
+
+        return $this;
+    }
+
+    public function getIdBuilding(): ?Building
+    {
+        return $this->id_building;
+    }
+
+    public function setIdBuilding(?Building $id_building): static
+    {
+        $this->id_building = $id_building;
+
+        return $this;
+    }
+
+    public function getStatut(): ?Statut
+    {
+        return $this->statut;
+    }
+
+    public function setStatut(?Statut $statut): static
+    {
+        $this->statut = $statut;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection<int, Bovine>
+     */
+    public function getBovines(): Collection
+    {
+        return $this->bovines;
+    }
+
+    public function addBovine(Bovine $bovine): static
+    {
+        if (!$this->bovines->contains($bovine)) {
+            $this->bovines->add($bovine);
+            $bovine->setBuildingCase($this);
+        }
+
+        return $this;
+    }
+
+    public function removeBovine(Bovine $bovine): static
+    {
+        if ($this->bovines->removeElement($bovine)) {
+            if ($bovine->getBuildingCase() === $this) {
+                $bovine->setBuildingCase(null);
+            }
+        }
+
+        return $this;
+    }
+}
--- a/src/Entity/BuildingCasePosition.php
+++ b/src/Entity/BuildingCasePosition.php
@@ -0,0 +1,145 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Attribute\SerializedName;
+
+#[ORM\Entity]
+class BuildingCasePosition
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['building:read'])]
+    private ?int $id = null;
+
+    #[ORM\Column]
+    #[Groups(['building:read'])]
+    private ?int $x = null;
+
+    #[ORM\Column]
+    #[Groups(['building:read'])]
+    private ?int $y = null;
+
+    #[ORM\Column]
+    #[Groups(['building:read'])]
+    private ?int $w = null;
+
+    #[ORM\Column]
+    #[Groups(['building:read'])]
+    private ?int $h = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['building:read'])]
+    #[SerializedName('renderOrder')]
+    private ?string $render_order = null;
+
+    #[ORM\ManyToOne(inversedBy: 'id_case_position')]
+    #[ORM\JoinColumn(nullable: false)]
+    private ?BuildingLayout $buildingLayout = null;
+
+    #[ORM\ManyToOne(inversedBy: 'id_case_position')]
+    #[ORM\JoinColumn(nullable: false)]
+    #[Groups(['building:read'])]
+    private ?BuildingCase $buildingCase = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function setId(int $id): static
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    public function getX(): ?int
+    {
+        return $this->x;
+    }
+
+    public function setX(int $x): static
+    {
+        $this->x = $x;
+
+        return $this;
+    }
+
+    public function getY(): ?int
+    {
+        return $this->y;
+    }
+
+    public function setY(int $y): static
+    {
+        $this->y = $y;
+
+        return $this;
+    }
+
+    public function getW(): ?int
+    {
+        return $this->w;
+    }
+
+    public function setW(int $w): static
+    {
+        $this->w = $w;
+
+        return $this;
+    }
+
+    public function getH(): ?int
+    {
+        return $this->h;
+    }
+
+    public function setH(int $h): static
+    {
+        $this->h = $h;
+
+        return $this;
+    }
+
+    public function getRenderOrder(): ?string
+    {
+        return $this->render_order;
+    }
+
+    public function setRenderOrder(string $render_order): static
+    {
+        $this->render_order = $render_order;
+
+        return $this;
+    }
+
+    public function getBuildingLayout(): ?BuildingLayout
+    {
+        return $this->buildingLayout;
+    }
+
+    public function setBuildingLayout(?BuildingLayout $buildingLayout): static
+    {
+        $this->buildingLayout = $buildingLayout;
+
+        return $this;
+    }
+
+    public function getBuildingCase(): ?BuildingCase
+    {
+        return $this->buildingCase;
+    }
+
+    public function setBuildingCase(?BuildingCase $buildingCase): static
+    {
+        $this->buildingCase = $buildingCase;
+
+        return $this;
+    }
+}
--- a/src/Entity/BuildingLayout.php
+++ b/src/Entity/BuildingLayout.php
@@ -0,0 +1,140 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Attribute\SerializedName;
+
+#[ORM\Entity]
+class BuildingLayout
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['building:read'])]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['building:read'])]
+    private ?string $name = null;
+
+    #[ORM\Column]
+    #[Groups(['building:read'])]
+    private ?int $columns = null;
+
+    #[ORM\Column]
+    #[Groups(['building:read'])]
+    private ?int $rows = null;
+
+    #[ORM\ManyToOne(inversedBy: 'buildingLayout')]
+    #[ORM\JoinColumn(nullable: false)]
+    private ?Building $id_building = null;
+
+    /**
+     * @var Collection<int, BuildingCasePosition>
+     */
+    #[ORM\OneToMany(targetEntity: BuildingCasePosition::class, mappedBy: 'buildingLayout')]
+    #[Groups(['building:read'])]
+    #[SerializedName('casePositions')]
+    private Collection $id_case_position;
+
+    public function __construct()
+    {
+        $this->id_case_position = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function setId(int $id): static
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+
+    public function setName(string $name): static
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function getColumns(): ?int
+    {
+        return $this->columns;
+    }
+
+    public function setColumns(int $columns): static
+    {
+        $this->columns = $columns;
+
+        return $this;
+    }
+
+    public function getRows(): ?int
+    {
+        return $this->rows;
+    }
+
+    public function setRows(int $rows): static
+    {
+        $this->rows = $rows;
+
+        return $this;
+    }
+
+    public function getIdBuilding(): ?Building
+    {
+        return $this->id_building;
+    }
+
+    public function setIdBuilding(?Building $id_building): static
+    {
+        $this->id_building = $id_building;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection<int, BuildingCasePosition>
+     */
+    public function getIdCasePosition(): Collection
+    {
+        return $this->id_case_position;
+    }
+
+    public function addIdCasePosition(BuildingCasePosition $idCasePosition): static
+    {
+        if (!$this->id_case_position->contains($idCasePosition)) {
+            $this->id_case_position->add($idCasePosition);
+            $idCasePosition->setBuildingLayout($this);
+        }
+
+        return $this;
+    }
+
+    public function removeIdCasePosition(BuildingCasePosition $idCasePosition): static
+    {
+        if ($this->id_case_position->removeElement($idCasePosition)) {
+            // set the owning side to null (unless already changed)
+            if ($idCasePosition->getBuildingLayout() === $this) {
+                $idCasePosition->setBuildingLayout(null);
+            }
+        }
+
+        return $this;
+    }
+}
--- a/src/Entity/Carrier.php
+++ b/src/Entity/Carrier.php
@@ -19,9 +19,11 @@ use Symfony\Component\Serializer\Attribute\Groups;
        new Get(
            requirements: ['id' => '\d+'],
            normalizationContext: ['groups' => ['carrier:read']],
+            security: "is_granted('ROLE_USER')"
        ),
        new GetCollection(
            normalizationContext: ['groups' => ['carrier:read']],
+            security: "is_granted('ROLE_USER')"
        ),
        new Post(
            normalizationContext: ['groups' => ['carrier:read']],
--- a/src/Entity/Customer.php
+++ b/src/Entity/Customer.php
@@ -8,6 +8,8 @@ use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
+use ApiPlatform\Metadata\Patch;
+use ApiPlatform\Metadata\Post;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -24,6 +26,16 @@ use Symfony\Component\Serializer\Attribute\Groups;
        new GetCollection(
            normalizationContext: ['groups' => ['customer:read']],
        ),
+        new Post(
+            normalizationContext: ['groups' => ['customer:read']],
+            denormalizationContext: ['groups' => ['customer:write']],
+            security: "is_granted('ROLE_ADMIN')",
+        ),
+        new Patch(
+            normalizationContext: ['groups' => ['customer:read']],
+            denormalizationContext: ['groups' => ['customer:write']],
+            security: "is_granted('ROLE_ADMIN')",
+        ),
    ],
    security: "is_granted('ROLE_USER')",
 )]
@@ -35,20 +47,24 @@ class Customer
    #[Groups(['shipment:read', 'customer:read'])]
    private ?int $id = null;

-    #[ORM\Column(length: 255)]
-    #[Groups(['customer:read', 'shipment:read'])]
-    private ?string $label = null;
+    #[ORM\Column(length: 180)]
+    #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
+    private string $name = '';

-    #[ORM\Column(length: 255)]
-    #[Groups(['customer:read', 'shipment:read'])]
-    private ?string $code = null;
+    #[ORM\Column(length: 180, nullable: true)]
+    #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
+    private ?string $email = null;
+
+    #[ORM\Column(length: 40, nullable: true)]
+    #[Groups(['customer:read', 'customer:write', 'shipment:read'])]
+    private ?string $phone = null;

    /**
     * @var Collection<int, Address>
     */
    #[ORM\ManyToMany(targetEntity: Address::class, inversedBy: 'customers')]
    #[ORM\JoinTable(name: 'customer_address')]
-    #[Groups(['customer:read'])]
+    #[Groups(['customer:read', 'customer:write'])]
    #[ApiProperty(readableLink: true)]
    private Collection $addresses;

@@ -62,24 +78,40 @@ class Customer
        return $this->id;
    }

-    public function getLabel(): ?string
+    public function getName(): string
    {
-        return $this->label;
+        return $this->name;
    }

-    public function setLabel(?string $label): void
+    public function setName(string $name): self
    {
-        $this->label = $label;
+        $this->name = $name;
+
+        return $this;
    }

-    public function getCode(): ?string
+    public function getEmail(): ?string
    {
-        return $this->code;
+        return $this->email;
    }

-    public function setCode(?string $code): void
+    public function setEmail(?string $email): self
    {
-        $this->code = $code;
+        $this->email = $email;
+
+        return $this;
+    }
+
+    public function getPhone(): ?string
+    {
+        return $this->phone;
+    }
+
+    public function setPhone(?string $phone): self
+    {
+        $this->phone = $phone;
+
+        return $this;
    }

    public function getAddresses(): Collection
@@ -87,8 +119,29 @@ class Customer
        return $this->addresses;
    }

-    public function setAddresses(Collection $addresses): void
+    public function setAddresses(iterable $addresses): self
    {
-        $this->addresses = $addresses;
+        $this->addresses->clear();
+        foreach ($addresses as $address) {
+            $this->addAddress($address);
+        }
+
+        return $this;
+    }
+
+    public function addAddress(Address $address): self
+    {
+        if (!$this->addresses->contains($address)) {
+            $this->addresses->add($address);
+        }
+
+        return $this;
+    }
+
+    public function removeAddress(Address $address): self
+    {
+        $this->addresses->removeElement($address);
+
+        return $this;
    }
 }
--- a/src/Entity/Shipment.php
+++ b/src/Entity/Shipment.php
@@ -80,7 +80,7 @@ class Shipment

    #[ORM\Column(length: 255)]
    #[Groups(['shipment:read', 'shipment:write'])]
-    private ?string $licencePlate = null;
+    private ?string $licensePlate = null;

    #[ORM\Column(length: 20, unique: true, nullable: true)]
    #[Groups(['shipment:read'])]
@@ -123,17 +123,15 @@ class Shipment
    #[ApiProperty(readableLink: true)]
    private ?Customer $customer = null;

-    /**
-     * @var Collection<int, BovinShipment>
-     */
-    #[ORM\OneToMany(
-        targetEntity: BovinShipment::class,
-        mappedBy: 'shipment',
-        cascade: ['persist', 'remove'],
-        orphanRemoval: true
-    )]
+    #[ORM\ManyToOne(inversedBy: 'shipments')]
+    #[ORM\JoinColumn(nullable: true)]
    #[Groups(['shipment:read', 'shipment:write'])]
-    private Collection $bovinShipments;
+    #[ApiProperty(readableLink: true)]
+    private ?ShipmentType $shipmentType = null;
+
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private int $nbBovinSend = 0;

    /**
     * @var Collection<int, Weight>
@@ -156,8 +154,7 @@ class Shipment

    public function __construct()
    {
-        $this->bovinShipments = new ArrayCollection();
-        $this->weights        = new ArrayCollection();
+        $this->weights = new ArrayCollection();
    }

    public function getId(): ?int
@@ -165,14 +162,14 @@ class Shipment
        return $this->id;
    }

-    public function getLicencePlate(): ?string
+    public function getLicensePlate(): ?string
    {
-        return $this->licencePlate;
+        return $this->licensePlate;
    }

-    public function setLicencePlate(?string $licencePlate): void
+    public function setLicensePlate(?string $licensePlate): void
    {
-        $this->licencePlate = $licencePlate;
+        $this->licensePlate = $licensePlate;
    }

    public function getIdentificationNumber(): ?string
@@ -195,6 +192,26 @@ class Shipment
        $this->currentStep = $currentStep;
    }

+    public function getShipmentType(): ?ShipmentType
+    {
+        return $this->shipmentType;
+    }
+
+    public function setShipmentType(?ShipmentType $shipmentType): void
+    {
+        $this->shipmentType = $shipmentType;
+    }
+
+    public function getNbBovinSend(): int
+    {
+        return $this->nbBovinSend;
+    }
+
+    public function setNbBovinSend(int $nbBovinSend): void
+    {
+        $this->nbBovinSend = $nbBovinSend;
+    }
+
    public function getIsValid(): ?bool
    {
        return $this->isValid;
@@ -261,37 +278,6 @@ class Shipment
        $this->customer = $customer;
    }

-    public function getBovinShipments(): Collection
-    {
-        return $this->bovinShipments;
-    }
-
-    public function setBovinShipments(Collection $bovinShipments): void
-    {
-        $this->bovinShipments = $bovinShipments;
-    }
-
-    public function addBovinShipment(BovinShipment $bovinShipment): self
-    {
-        if (!$this->bovinShipments->contains($bovinShipment)) {
-            $this->bovinShipments->add($bovinShipment);
-            $bovinShipment->setShipment($this);
-        }
-
-        return $this;
-    }
-
-    public function removeBovinShipment(BovinShipment $bovinShipment): self
-    {
-        if ($this->bovinShipments->removeElement($bovinShipment)) {
-            if ($bovinShipment->getShipment() === $this) {
-                $bovinShipment->setShipment(null);
-            }
-        }
-
-        return $this;
-    }
-
    /**
     * @return Collection<int, Weight>
     */
@@ -328,7 +314,7 @@ class Shipment
            return;
        }

-        $number                     = sprintf('P-BR-%04d', $this->id);
+        $number                     = sprintf('P-BL-%04d', $this->id);
        $this->identificationNumber = $number;

        $args->getObjectManager()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
gitea-actions	a0557b077b	chore: bump version to v0.0.64 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m20s Details	2026-02-27 10:06:55 +00:00
sroy	2d2b38eae4	[#355 ] modification front de la page admin transporteur (!36 ) Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details \| Numéro du ticket \| Titre du ticket \| \|------------------\|-----------------\| \| #355 \| modification front de la page admin transporteur \| ## Description de la PR ## Modification du .env ## Check list - [x] Pas de régression - [ ] TU/TI/TF rédigée - [x] TU/TI/TF OK - [x] CHANGELOG modifié Reviewed-on: #36 Reviewed-by: Autin <tristan@yuno.malio.fr> Co-authored-by: sroy <sebastien@yuno.malio.fr> Co-committed-by: sroy <sebastien@yuno.malio.fr>	2026-02-27 10:06:49 +00:00
gitea-actions	d3581b8ce6	chore: bump version to v0.0.63 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m20s Details	2026-02-27 09:05:28 +00:00
sroy	9e53be8ac3	[#352 ] modification front admin fournisseur (!35 ) Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details \| Numéro du ticket \| Titre du ticket \| \|------------------\|-----------------\| \| #352 \| modification front admin fournisseur \| ## Description de la PR ## Modification du .env ## Check list - [x] Pas de régression - [ ] TU/TI/TF rédigée - [x] TU/TI/TF OK - [x] CHANGELOG modifié Reviewed-on: #35 Reviewed-by: Autin <tristan@yuno.malio.fr> Co-authored-by: sroy <sebastien@yuno.malio.fr> Co-committed-by: sroy <sebastien@yuno.malio.fr>	2026-02-27 09:05:22 +00:00
gitea-actions	2aafa2082a	chore: bump version to v0.0.62 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m18s Details	2026-02-26 14:01:46 +00:00
sroy	2b64f024b6	[#327 ] Afficher modifier une expédition terminée (!34 ) All checks were successful Auto Tag Develop / tag (push) Successful in 6s Details \| Numéro du ticket \| Titre du ticket \| \|------------------\|-----------------\| \| #327 \| Afficher modifier une expédition terminée \| ## Description de la PR ## Modification du .env ## Check list - [x] Pas de régression - [ ] TU/TI/TF rédigée - [x] TU/TI/TF OK - [x] CHANGELOG modifié Reviewed-on: #34 Reviewed-by: Autin <tristan@yuno.malio.fr> Co-authored-by: sroy <sebastien@yuno.malio.fr> Co-committed-by: sroy <sebastien@yuno.malio.fr>	2026-02-26 14:01:39 +00:00
gitea-actions	47cac04257	chore: bump version to v0.0.61 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m16s Details	2026-02-26 09:28:11 +00:00
tristan	59d76c5f14	fix : page de modification reception qui crash en prod All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details	2026-02-26 10:28:00 +01:00
gitea-actions	c48cc477da	chore: bump version to v0.0.60 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m16s Details	2026-02-26 08:46:45 +00:00
tristan	5967665e9f	fix : page de modification reception qui crash en prod All checks were successful Auto Tag Develop / tag (push) Successful in 6s Details	2026-02-26 09:46:34 +01:00
gitea-actions	393c420983	chore: bump version to v0.0.59 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m15s Details	2026-02-26 08:34:02 +00:00
tristan	456623b403	fix : CHANGELOG.md All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details	2026-02-26 09:33:52 +01:00
gitea-actions	e2a8e89e55	chore: bump version to v0.0.58 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m14s Details	2026-02-26 08:25:26 +00:00
sroy	92a5c48e5e	[#332 ]Refonte écran réception terminée (!31 ) All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details \| Numéro du ticket \| Titre du ticket \| \|------------------\|-----------------\| \| #332 \| Refonte écran réception terminée \| ## Description de la PR ## Modification du .env ## Check list - [x] Pas de régression - [ ] TU/TI/TF rédigée - [x] TU/TI/TF OK - [x] CHANGELOG modifié Co-authored-by: tristan <tristan@yuno.malio.fr> Reviewed-on: #31 Reviewed-by: Autin <tristan@yuno.malio.fr> Co-authored-by: sroy <sebastien@yuno.malio.fr> Co-committed-by: sroy <sebastien@yuno.malio.fr>	2026-02-26 08:25:20 +00:00
gitea-actions	6766985713	chore: bump version to v0.0.57 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m16s Details	2026-02-26 08:10:21 +00:00
Matteo	c0d05264df	[#334 ] Correctifs (!32 ) All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details \| Numéro du ticket \| Titre du ticket \| \|------------------\|-----------------\| \| 334 \| Correctifs \| ## Description de la PR ## Modification du .env ## Check list - [x] Pas de régression - [ ] TU/TI/TF rédigée - [x] TU/TI/TF OK - [x] CHANGELOG modifié Reviewed-on: #32 Co-authored-by: Matteo <matteo@yuno.malio.fr> Co-committed-by: Matteo <matteo@yuno.malio.fr>	2026-02-26 08:10:15 +00:00
gitea-actions	9505201499	chore: bump version to v0.0.56 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m23s Details	2026-02-26 07:42:10 +00:00
tristan	624591c096	feat : finalisation du tableau d'estimation des poids bovin All checks were successful Auto Tag Develop / tag (push) Successful in 7s Details	2026-02-26 08:41:56 +01:00
gitea-actions	e31bdce713	chore: bump version to v0.0.55 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m14s Details	2026-02-25 14:48:38 +00:00
tristan	5d72beaf8d	Merge remote-tracking branch 'origin/develop' into develop Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-02-25 15:48:19 +01:00
tristan	43f34015c6	fix : app seed	2026-02-25 15:39:05 +01:00
gitea-actions	ac5ce07e61	chore: bump version to v0.0.54 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m15s Details	2026-02-25 14:31:35 +00:00
tristan	e9fb36cc24	fix : suppression des repositories qui ne servent à rien All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details	2026-02-25 15:31:26 +01:00
gitea-actions	06a41c5f85	chore: bump version to v0.0.53 All checks were successful Build Release Artefact / build (push) Successful in 1m19s Details Auto Tag Develop / tag (push) Successful in 4s Details	2026-02-25 14:16:18 +00:00
tristan	f263a11fe8	[#278 ] Plan du site (!33 ) Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details \| Numéro du ticket \| Titre du ticket \| \|------------------\|-----------------\| \| #278 \| Plan du site \| ## Description de la PR [#278] Plan du site ## Modification du .env ## Check list - [ ] Pas de régression - [x] TU/TI/TF rédigée - [x] TU/TI/TF OK - [ ] CHANGELOG modifié Co-authored-by: Matteo <matteo@yuno.malio.fr> Reviewed-on: #33 Co-authored-by: tristan <tristan@yuno.malio.fr> Co-committed-by: tristan <tristan@yuno.malio.fr>	2026-02-25 14:16:11 +00:00
gitea-actions	c52f22472d	chore: bump version to v0.0.52 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m19s Details	2026-02-19 07:47:19 +00:00
kevin	e7421e985e	[#331 ] Mettre à jour l'entité Shipment et bovin_shipment (!30 ) All checks were successful Auto Tag Develop / tag (push) Successful in 6s Details \| Numéro du ticket \| Titre du ticket \| \|------------------\|-----------------\| \| #331 \| Mettre à jour l'entité Shipment et bovin_shipment \| ## Description de la PR ## Modification du .env ## Check list - [x] Pas de régression - [ ] TU/TI/TF rédigée - [x] TU/TI/TF OK - [x] CHANGELOG modifié Reviewed-on: #30 Reviewed-by: Autin <tristan@yuno.malio.fr> Co-authored-by: kevin <kevin@yuno.malio.fr> Co-committed-by: kevin <kevin@yuno.malio.fr>	2026-02-19 07:47:13 +00:00
gitea-actions	0d258ae9c6	chore: bump version to v0.0.51 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m15s Details	2026-02-17 13:22:34 +00:00
Matteo	7dd615ea34	Bovins Admin (!29 ) Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details \| Numéro du ticket \| Titre du ticket \| \|------------------\|-----------------\| \| \| \| ## Description de la PR ## Modification du .env ## Check list - [x] Pas de régression - [ ] TU/TI/TF rédigée - [x] TU/TI/TF OK - [x] CHANGELOG modifié Reviewed-on: #29 Reviewed-by: Autin <tristan@yuno.malio.fr> Co-authored-by: Matteo <matteo@yuno.malio.fr> Co-committed-by: Matteo <matteo@yuno.malio.fr>	2026-02-17 13:22:29 +00:00
gitea-actions	6eee0745a7	chore: bump version to v0.0.50 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m22s Details	2026-02-17 07:20:06 +00:00
tristan	845f94db8c	fix : correction du role pour la récupération de la liste des supplier All checks were successful Auto Tag Develop / tag (push) Successful in 6s Details	2026-02-17 08:19:56 +01:00
gitea-actions	86c0e74074	chore: bump version to v0.0.49 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m15s Details	2026-02-16 15:26:13 +00:00
tristan	be29daf4d1	fix : corrections de tous les retours + modification de la seed et fixtures All checks were successful Auto Tag Develop / tag (push) Successful in 5s Details	2026-02-16 16:26:00 +01:00
gitea-actions	08e7c1508c	chore: bump version to v0.0.48 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m12s Details	2026-02-16 14:32:35 +00:00
Matteo	358da6a8ad	Navbar (!28 ) Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details \| \| Layout-Admin \| \|------------------\|-----------------\| \| \| \| ## Description de la PR ## Modification du .env ## Check list - [ ] Pas de régression - [ ] TU/TI/TF rédigée - [ ] TU/TI/TF OK - [ ] CHANGELOG modifié Reviewed-on: #28 Reviewed-by: Autin <tristan@yuno.malio.fr> Co-authored-by: Matteo <matteo@yuno.malio.fr> Co-committed-by: Matteo <matteo@yuno.malio.fr>	2026-02-16 14:32:31 +00:00
gitea-actions	67428186f6	chore: bump version to v0.0.47 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m12s Details	2026-02-13 16:07:27 +00:00
tristan	09d108a1d5	fix : corrections de tous les retours All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details	2026-02-13 17:07:15 +01:00
gitea-actions	f58dc36a0d	chore: bump version to v0.0.46 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m15s Details	2026-02-13 13:07:36 +00:00
tristan	15c0f414af	fix : corrections doublon fixture Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-02-13 14:07:25 +01:00
gitea-actions	9ed0ba702e	chore: bump version to v0.0.45 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m15s Details	2026-02-13 12:44:39 +00:00
tristan	93edd0a563	fix : corrections de l'entity customer.php et de la partie admin front qui lui est lié + update des fixtures/seed Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details	2026-02-13 13:44:21 +01:00
gitea-actions	c361ef9bb9	chore: bump version to v0.0.44 All checks were successful Auto Tag Develop / tag (push) Successful in 3s Details Build Release Artefact / build (push) Successful in 1m11s Details	2026-02-13 08:10:40 +00:00
kevin	7f3d9ef9c6	[#325 ] Corrections diverses (!26 ) Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details \| Numéro du ticket \| Titre du ticket \| \|------------------\|-----------------\| \| #325 \| Corrections diverses \| ## Description de la PR ## Modification du .env ## Check list - [x] Pas de régression - [ ] TU/TI/TF rédigée - [x] TU/TI/TF OK - [x] CHANGELOG modifié Reviewed-on: #26 Reviewed-by: Autin <tristan@yuno.malio.fr> Co-authored-by: kevin <kevin@yuno.malio.fr> Co-committed-by: kevin <kevin@yuno.malio.fr>	2026-02-13 08:10:33 +00:00
gitea-actions	22b959de85	chore: bump version to v0.0.43 All checks were successful Auto Tag Develop / tag (push) Successful in 4s Details Build Release Artefact / build (push) Successful in 1m16s Details	2026-02-13 07:37:06 +00:00
Matteo	d3bc2e11f1	[#326 ] Admin modification creation client (!25 ) Some checks failed Auto Tag Develop / tag (push) Has been cancelled Details \| Numéro du ticket \| Titre du ticket \| \|------------------\|-----------------\| \| #326 \| Admin modification creation client \| ## Description de la PR ## Modification du .env ## Check list - [x] Pas de régression - [ ] TU/TI/TF rédigée - [x] TU/TI/TF OK - [x] CHANGELOG modifié Reviewed-on: #25 Reviewed-by: Autin <tristan@yuno.malio.fr> Co-authored-by: Matteo <matteo@yuno.malio.fr> Co-committed-by: Matteo <matteo@yuno.malio.fr>	2026-02-13 07:36:58 +00:00