From 5fd2ab847053057a0ce99730fd8216c5df68ced3 Mon Sep 17 00:00:00 2001
From: Matteo <matteo@yuno.malio.fr>
Date: Tue, 3 Feb 2026 17:16:19 +0100
Subject: [PATCH 01/12] =?UTF-8?q?feat=20:=20mise=20=C3=A0=20jour=20du=20bo?=
 =?UTF-8?q?n=20de=20r=C3=A9ception=20wip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/dataSources.xml                        |  2 +-
 .idea/inspectionProfiles/Project_Default.xml |  6 --
 .idea/php.xml                                |  1 +
 .idea/workspace.xml                          | 65 +++++++++-------
 src/Entity/Address.php                       | 37 +++++++++
 src/Entity/Carrier.php                       | 80 ++++++++++++++++++++
 src/Entity/Vehicle.php                       | 43 +++++++++++
 7 files changed, 200 insertions(+), 34 deletions(-)
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 0b73c9c..15f93b9 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -5,7 +5,7 @@
       <driver-ref>postgresql</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://localhost:5433/ferme</jdbc-url>
+      <jdbc-url>jdbc:postgresql://localhost:5432/ferme</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
     <data-source source="LOCAL" name="Ferme recette" uuid="ae622167-c834-4e7b-87a5-c1721036f5dc">
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index d829d01..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PhpCSFixerValidationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
index a873179..a081fbb 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -15,6 +15,7 @@
   <component name="PhpCSFixer">
     <phpcsfixer_settings>
       <PhpCSFixerConfiguration tool_path="$PROJECT_DIR$/vendor/bin/php-cs-fixer" />
+      <phpcs_fixer_by_interpreter asDefaultInterpreter="true" interpreter_id="990ff521-e6e9-4080-9cc9-228367d597f9" tool_path="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\vendor\bin\php-cs-fixer" timeout="30000" />
     </phpcsfixer_settings>
   </component>
   <component name="PhpCodeSniffer">
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d5f5372..dd56244 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,8 +6,13 @@
   <component name="ChangeListManager">
     <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : mise à jour du bon de réception">
       <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Address.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Address.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Carrier.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Carrier.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Vehicle.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Vehicle.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -20,7 +25,6 @@
   </component>
   <component name="EmbeddingIndexingInfo">
     <option name="cachedIndexableFilesCount" value="151" />
-    <option name="fileBasedEmbeddingIndicesEnabled" value="true" />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -38,6 +42,9 @@
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/src/Entity/BovinType.php" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" />
+  </component>
   <component name="McpProjectServerCommands">
     <commands />
     <urls />
@@ -51,7 +58,7 @@
       </server>
     </servers>
   </component>
-  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="/bin/php">
+  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="C:/php/php.exe">
     <include_path>
       <path value="$PROJECT_DIR$/vendor/psr/log" />
       <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
@@ -214,36 +221,39 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.MCP Project settings loaded&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;develop&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/home/sroy/Documents/test/Ferme&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;configurable.group.appearance&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.MCP Project settings loaded": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
+    "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
+    "git-widget-placeholder": "feat/271-expedition-etape-1",
+    "junie.onboarding.icon.badge.shown": "true",
+    "last_opened_file_path": "/home/sroy/Documents/test/Ferme",
+    "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.group.appearance",
+    "to.speed.mode.migration.done": "true",
+    "ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
+    "vue.rearranger.settings.migration": "true"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;DatabaseDriversLRU&quot;: [
-      &quot;postgresql&quot;
+  "keyToStringList": {
+    "DatabaseDriversLRU": [
+      "postgresql"
     ],
-    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
-      &quot;TEXT&quot;
+    "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
+      "TEXT"
     ],
-    &quot;vue.recent.templates&quot;: [
-      &quot;Vue Composition API Component&quot;
+    "vue.recent.templates": [
+      "Vue Composition API Component"
     ]
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
@@ -287,6 +297,7 @@
       <workItem from="1770055690365" duration="370000" />
       <workItem from="1770056515646" duration="21000" />
       <workItem from="1770102495553" duration="2280000" />
+      <workItem from="1770125858721" duration="9357000" />
     </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" />
diff --git a/src/Entity/Address.php b/src/Entity/Address.php
index 81903d4..c06a159 100644
--- a/src/Entity/Address.php
+++ b/src/Entity/Address.php
@@ -64,9 +64,16 @@ class Address
     #[ORM\ManyToMany(targetEntity: Supplier::class, mappedBy: 'addresses')]
     private Collection $suppliers;
 
+    /**
+     * @var Collection<int, Customer>
+     */
+    #[ORM\OneToMany(targetEntity: Customer::class, mappedBy: 'id_adress')]
+    private Collection $customers;
+
     public function __construct()
     {
         $this->suppliers = new ArrayCollection();
+        $this->customers = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -165,4 +172,34 @@ class Address
     {
         return $this->suppliers;
     }
+
+    /**
+     * @return Collection<int, Customer>
+     */
+    public function getCustomers(): Collection
+    {
+        return $this->customers;
+    }
+
+    public function addCustomer(Customer $customer): static
+    {
+        if (!$this->customers->contains($customer)) {
+            $this->customers->add($customer);
+            $customer->setIdAdress($this);
+        }
+
+        return $this;
+    }
+
+    public function removeCustomer(Customer $customer): static
+    {
+        if ($this->customers->removeElement($customer)) {
+            // set the owning side to null (unless already changed)
+            if ($customer->getIdAdress() === $this) {
+                $customer->setIdAdress(null);
+            }
+        }
+
+        return $this;
+    }
 }
diff --git a/src/Entity/Carrier.php b/src/Entity/Carrier.php
index d9a16a2..5f9ace4 100644
--- a/src/Entity/Carrier.php
+++ b/src/Entity/Carrier.php
@@ -7,6 +7,8 @@ namespace App\Entity;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;
 
@@ -40,6 +42,24 @@ class Carrier
     #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read'])]
     private ?string $code = null;
 
+    /**
+     * @var Collection<int, Shipment>
+     */
+    #[ORM\OneToMany(targetEntity: Shipment::class, mappedBy: 'id_carrier')]
+    private Collection $id_carrier_1;
+
+    /**
+     * @var Collection<int, Shipment>
+     */
+    #[ORM\OneToMany(targetEntity: Shipment::class, mappedBy: 'licence_plate_1')]
+    private Collection $shipments;
+
+    public function __construct()
+    {
+        $this->id_carrier_1 = new ArrayCollection();
+        $this->shipments    = new ArrayCollection();
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -68,4 +88,64 @@ class Carrier
 
         return $this;
     }
+
+    /**
+     * @return Collection<int, Shipment>
+     */
+    public function getIdCarrier1(): Collection
+    {
+        return $this->id_carrier_1;
+    }
+
+    public function addIdCarrier1(Shipment $idCarrier1): static
+    {
+        if (!$this->id_carrier_1->contains($idCarrier1)) {
+            $this->id_carrier_1->add($idCarrier1);
+            $idCarrier1->setIdCarrier($this);
+        }
+
+        return $this;
+    }
+
+    public function removeIdCarrier1(Shipment $idCarrier1): static
+    {
+        if ($this->id_carrier_1->removeElement($idCarrier1)) {
+            // set the owning side to null (unless already changed)
+            if ($idCarrier1->getIdCarrier() === $this) {
+                $idCarrier1->setIdCarrier(null);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return Collection<int, Shipment>
+     */
+    public function getShipments(): Collection
+    {
+        return $this->shipments;
+    }
+
+    public function addShipment(Shipment $shipment): static
+    {
+        if (!$this->shipments->contains($shipment)) {
+            $this->shipments->add($shipment);
+            $shipment->setLicencePlate1($this);
+        }
+
+        return $this;
+    }
+
+    public function removeShipment(Shipment $shipment): static
+    {
+        if ($this->shipments->removeElement($shipment)) {
+            // set the owning side to null (unless already changed)
+            if ($shipment->getLicencePlate1() === $this) {
+                $shipment->setLicencePlate1(null);
+            }
+        }
+
+        return $this;
+    }
 }
diff --git a/src/Entity/Vehicle.php b/src/Entity/Vehicle.php
index 6a849ed..ea6ec10 100644
--- a/src/Entity/Vehicle.php
+++ b/src/Entity/Vehicle.php
@@ -8,6 +8,8 @@ use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;
 
@@ -49,6 +51,17 @@ class Vehicle
     #[ApiProperty(readableLink: true)]
     private ?Truck $truck = null;
 
+    /**
+     * @var Collection<int, Shipment>
+     */
+    #[ORM\OneToMany(targetEntity: Shipment::class, mappedBy: 'id_carrier_1')]
+    private Collection $shipments;
+
+    public function __construct()
+    {
+        $this->shipments = new ArrayCollection();
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -89,4 +102,34 @@ class Vehicle
 
         return $this;
     }
+
+    /**
+     * @return Collection<int, Shipment>
+     */
+    public function getShipments(): Collection
+    {
+        return $this->shipments;
+    }
+
+    public function addShipment(Shipment $shipment): static
+    {
+        if (!$this->shipments->contains($shipment)) {
+            $this->shipments->add($shipment);
+            $shipment->setIdCarrier1($this);
+        }
+
+        return $this;
+    }
+
+    public function removeShipment(Shipment $shipment): static
+    {
+        if ($this->shipments->removeElement($shipment)) {
+            // set the owning side to null (unless already changed)
+            if ($shipment->getIdCarrier1() === $this) {
+                $shipment->setIdCarrier1(null);
+            }
+        }
+
+        return $this;
+    }
 }
-- 
2.39.5


From 081c2ef4037bd1578c2350834fd90b5a61c7c238 Mon Sep 17 00:00:00 2001
From: Matteo <matteo@yuno.malio.fr>
Date: Tue, 3 Feb 2026 17:16:47 +0100
Subject: [PATCH 02/12] =?UTF-8?q?feat=20:=20mise=20=C3=A0=20jour=20du=20bo?=
 =?UTF-8?q?n=20de=20r=C3=A9ception=20WIP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 migrations/Version20260203152543.php |  64 ++++++
 src/Entity/BovinShipment.php         |  71 +++++++
 src/Entity/BovineTypeShipment.php    | 110 +++++++++++
 src/Entity/Customer.php              | 113 +++++++++++
 src/Entity/Shipment.php              | 284 +++++++++++++++++++++++++++
 5 files changed, 642 insertions(+)
 create mode 100644 migrations/Version20260203152543.php
 create mode 100644 src/Entity/BovinShipment.php
 create mode 100644 src/Entity/BovineTypeShipment.php
 create mode 100644 src/Entity/Customer.php
 create mode 100644 src/Entity/Shipment.php

diff --git a/migrations/Version20260203152543.php b/migrations/Version20260203152543.php
new file mode 100644
index 0000000..ac37491
--- /dev/null
+++ b/migrations/Version20260203152543.php
@@ -0,0 +1,64 @@
+<?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 Version20260203152543 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 bovin_shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, nb_bovin_send INT NOT NULL, shipment_id INT DEFAULT NULL, bovine_type_id INT DEFAULT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE INDEX IDX_7049F4507BE036FC ON bovin_shipment (shipment_id)');
+        $this->addSql('CREATE INDEX IDX_7049F4507899F32E ON bovin_shipment (bovine_type_id)');
+        $this->addSql('CREATE TABLE bovine_type_shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, type_label VARCHAR(255) NOT NULL, type_code VARCHAR(255) NOT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE TABLE customer (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, customer_label VARCHAR(255) NOT NULL, customer_code VARCHAR(255) NOT NULL, id_adress_id INT DEFAULT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE INDEX IDX_81398E094B3458B ON customer (id_adress_id)');
+        $this->addSql('CREATE TABLE shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, date_receipt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, is_waiting BOOLEAN NOT NULL, licence_plate VARCHAR(255) NOT NULL, test VARCHAR(255) NOT NULL, id_carrier_id INT DEFAULT NULL, id_carrier_1_id INT DEFAULT NULL, id_truck_id INT DEFAULT NULL, licence_plate_1_id INT DEFAULT NULL, id_vehicle_id INT DEFAULT NULL, id_customer_id INT DEFAULT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE INDEX IDX_2CB20DC84554740 ON shipment (id_carrier_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DC817F550F ON shipment (id_carrier_1_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DC964E905B ON shipment (id_truck_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DC3B17D73A ON shipment (licence_plate_1_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DCF1D99706 ON shipment (id_vehicle_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DC8B870E04 ON shipment (id_customer_id)');
+        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT FK_7049F4507BE036FC FOREIGN KEY (shipment_id) REFERENCES shipment (id)');
+        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT FK_7049F4507899F32E FOREIGN KEY (bovine_type_id) REFERENCES bovine_type_shipment (id)');
+        $this->addSql('ALTER TABLE customer ADD CONSTRAINT FK_81398E094B3458B FOREIGN KEY (id_adress_id) REFERENCES address (id)');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC84554740 FOREIGN KEY (id_carrier_id) REFERENCES carrier (id)');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC817F550F FOREIGN KEY (id_carrier_1_id) REFERENCES vehicle (id)');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC964E905B FOREIGN KEY (id_truck_id) REFERENCES vehicle (id)');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC3B17D73A FOREIGN KEY (licence_plate_1_id) REFERENCES carrier (id)');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DCF1D99706 FOREIGN KEY (id_vehicle_id) REFERENCES vehicle (id)');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC8B870E04 FOREIGN KEY (id_customer_id) REFERENCES customer (id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT FK_7049F4507BE036FC');
+        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT FK_7049F4507899F32E');
+        $this->addSql('ALTER TABLE customer DROP CONSTRAINT FK_81398E094B3458B');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC84554740');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC817F550F');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC964E905B');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC3B17D73A');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DCF1D99706');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC8B870E04');
+        $this->addSql('DROP TABLE bovin_shipment');
+        $this->addSql('DROP TABLE bovine_type_shipment');
+        $this->addSql('DROP TABLE customer');
+        $this->addSql('DROP TABLE shipment');
+    }
+}
diff --git a/src/Entity/BovinShipment.php b/src/Entity/BovinShipment.php
new file mode 100644
index 0000000..7d261a0
--- /dev/null
+++ b/src/Entity/BovinShipment.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'bovin_shipment')]
+class BovinShipment
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'bovine-shipment:read'])]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne(inversedBy: 'shipment')]
+    #[Groups(['shipment:read', 'shipment:write', 'bovine-shipment:read', 'bovine-shipment:write'])]
+    private ?Shipment $Shipment = null;
+
+    #[ORM\ManyToOne(inversedBy: 'bovinShipments')]
+    #[Groups(['shipment:read', 'shipment:write', 'bovine-shipment:read', 'bovine-shipment:write'])]
+    private ?BovineTypeShipment $BovineType = null;
+
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'shipment:write', 'bovine-shipment:read', 'bovine-shipment:write'])]
+    private ?int $nbBovinSend = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getIdShipment(): ?Shipment
+    {
+        return $this->Shipment;
+    }
+
+    public function setIdShipment(?Shipment $Shipment): static
+    {
+        $this->Shipment = $Shipment;
+
+        return $this;
+    }
+
+    public function getIdType(): ?BovineTypeShipment
+    {
+        return $this->BovineType;
+    }
+
+    public function setIdType(?BovineTypeShipment $BovineType): static
+    {
+        $this->BovineType = $BovineType;
+
+        return $this;
+    }
+
+    public function getNbBovinSend(): ?int
+    {
+        return $this->nbBovinSend;
+    }
+
+    public function setNbBovinSend(int $nbBovinSend): static
+    {
+        $this->nbBovinSend = $nbBovinSend;
+
+        return $this;
+    }
+}
diff --git a/src/Entity/BovineTypeShipment.php b/src/Entity/BovineTypeShipment.php
new file mode 100644
index 0000000..f333fdc
--- /dev/null
+++ b/src/Entity/BovineTypeShipment.php
@@ -0,0 +1,110 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+class BovineTypeShipment
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'bovine-type:read'])]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['shipment:read', 'shipment:write', 'bovine-type:read', 'bovine-type:write'])]
+    private ?string $type_label = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['shipment:read', 'shipment:write', 'bovine-type:read', 'bovine-type:write'])]
+    private ?string $type_code = null;
+
+    /**
+     * @var Collection<int, BovinShipment>
+     */
+    #[ORM\OneToMany(targetEntity: BovinShipment::class, mappedBy: 'id_type')]
+    #[Groups(['shipment:read', 'shipment:write', 'bovine-type:read', 'bovine-type:write'])]
+    private Collection $bovinShipments;
+
+    public function __construct()
+    {
+        $this->bovinShipments = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getTypeLabel(): ?string
+    {
+        return $this->type_label;
+    }
+
+    public function setTypeLabel(string $type_label): static
+    {
+        $this->type_label = $type_label;
+
+        return $this;
+    }
+
+    public function getTypeCode(): ?string
+    {
+        return $this->type_code;
+    }
+
+    public function setTypeCode(string $type_code): static
+    {
+        $this->type_code = $type_code;
+
+        return $this;
+    }
+
+    public function getBovineShipment(): ?BovineShipment
+    {
+        return $this->bovineShipment;
+    }
+
+    public function setBovineShipment(?BovineShipment $bovineShipment): static
+    {
+        $this->bovineShipment = $bovineShipment;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection<int, BovinShipment>
+     */
+    public function getBovinShipments(): Collection
+    {
+        return $this->bovinShipments;
+    }
+
+    public function addBovinShipment(BovinShipment $bovinShipment): static
+    {
+        if (!$this->bovinShipments->contains($bovinShipment)) {
+            $this->bovinShipments->add($bovinShipment);
+            $bovinShipment->setIdType($this);
+        }
+
+        return $this;
+    }
+
+    public function removeBovinShipment(BovinShipment $bovinShipment): static
+    {
+        if ($this->bovinShipments->removeElement($bovinShipment)) {
+            // set the owning side to null (unless already changed)
+            if ($bovinShipment->getIdType() === $this) {
+                $bovinShipment->setIdType(null);
+            }
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Entity/Customer.php b/src/Entity/Customer.php
new file mode 100644
index 0000000..03bcbcd
--- /dev/null
+++ b/src/Entity/Customer.php
@@ -0,0 +1,113 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+class Customer
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'customer:read'])]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['shipment:read', 'shipment:write', 'customer:read', 'customer:write'])]
+    private ?string $customer_label = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['shipment:read', 'shipment:write', 'customer:read', 'customer:write'])]
+    private ?string $customer_code = null;
+
+    #[ORM\ManyToOne(inversedBy: 'customers')]
+    #[Groups(['shipment:read', 'shipment:write', 'customer:read', 'customer:write'])]
+    private ?Address $id_adress = null;
+
+    /**
+     * @var Collection<int, Shipment>
+     */
+    #[ORM\OneToMany(targetEntity: Shipment::class, mappedBy: 'id_customer')]
+    private Collection $shipments;
+
+    public function __construct()
+    {
+        $this->shipments = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getCustomerLabel(): ?string
+    {
+        return $this->customer_label;
+    }
+
+    public function setCustomerLabel(string $customer_label): static
+    {
+        $this->customer_label = $customer_label;
+
+        return $this;
+    }
+
+    public function getCustomerCode(): ?string
+    {
+        return $this->customer_code;
+    }
+
+    public function setCustomerCode(string $customer_code): static
+    {
+        $this->customer_code = $customer_code;
+
+        return $this;
+    }
+
+    public function getIdAdress(): ?Address
+    {
+        return $this->id_adress;
+    }
+
+    public function setIdAdress(?Address $id_adress): static
+    {
+        $this->id_adress = $id_adress;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection<int, Shipment>
+     */
+    public function getShipments(): Collection
+    {
+        return $this->shipments;
+    }
+
+    public function addShipment(Shipment $shipment): static
+    {
+        if (!$this->shipments->contains($shipment)) {
+            $this->shipments->add($shipment);
+            $shipment->setIdCustomer($this);
+        }
+
+        return $this;
+    }
+
+    public function removeShipment(Shipment $shipment): static
+    {
+        if ($this->shipments->removeElement($shipment)) {
+            // set the owning side to null (unless already changed)
+            if ($shipment->getIdCustomer() === $this) {
+                $shipment->setIdCustomer(null);
+            }
+        }
+
+        return $this;
+    }
+}
diff --git a/src/Entity/Shipment.php b/src/Entity/Shipment.php
new file mode 100644
index 0000000..74a5299
--- /dev/null
+++ b/src/Entity/Shipment.php
@@ -0,0 +1,284 @@
+<?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 DateTime;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'shipment')]
+#[ApiResource(
+    operations: [
+        new Get(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['shipment:read']],
+        ),
+        new GetCollection(
+            normalizationContext: ['groups' => ['shipment:read']],
+        ),
+        new Post(
+            normalizationContext: ['groups' => ['shipment:read']],
+            denormalizationContext: ['groups' => ['shipment:write']],
+        ),
+        new Patch(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['shipment:read']],
+            denormalizationContext: ['groups' => ['shipment:write']],
+        ),
+        //        new Get(
+        //            uriTemplate: '/receptions/weigh',
+        //            openapi: new OpenApiOperation(
+        //                summary: 'Fetch the current weight reading',
+        //                description: 'Queries the pont-bascule and returns the weight data.',
+        //            ),
+        //            normalizationContext: ['groups' => ['reception:weigh:read']],
+        //            output: PontBasculeReading::class,
+        //            provider: ReceptionWeighingProvider::class,
+        //        ),
+        //        new Get(
+        //            uriTemplate: '/receptions/{id}/receipt',
+        //            requirements: ['id' => '\d+'],
+        //            openapi: new OpenApiOperation(
+        //                summary: 'Render a reception receipt',
+        //                description: 'Returns a PDF receipt for the reception.',
+        //            ),
+        //            output: false,
+        //            provider: ReceptionReceiptProvider::class,
+        //        ),
+    ],
+)]
+class Shipment
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['shipment:read'])]
+    private ?int $id = null;
+
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?DateTime $date_receipt = null;
+
+    #[ORM\Column]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?bool $is_waiting = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?string $licence_plate = null;
+
+    #[ORM\ManyToOne(inversedBy: 'id_carrier_1')]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?carrier $id_carrier = null;
+
+    #[ORM\ManyToOne(inversedBy: 'shipments')]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?vehicle $id_carrier_1 = null;
+
+    #[ORM\ManyToOne(inversedBy: 'shipments')]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?Vehicle $id_truck = null;
+
+    #[ORM\ManyToOne(inversedBy: 'shipments')]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?carrier $licence_plate_1 = null;
+
+    #[ORM\ManyToOne(inversedBy: 'shipments')]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?Vehicle $id_vehicle = null;
+
+    #[ORM\ManyToOne(inversedBy: 'shipments')]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?Customer $id_customer = null;
+
+    /**
+     * @var Collection<int, BovinShipment>
+     */
+    #[ORM\OneToMany(targetEntity: BovinShipment::class, mappedBy: 'id_shipment')]
+    private Collection $id_type;
+
+    #[ORM\Column(length: 255)]
+    private ?string $test = null;
+
+    public function __construct()
+    {
+        $this->id_type = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getDateReceipt(): ?DateTime
+    {
+        return $this->date_receipt;
+    }
+
+    public function setDateReceipt(DateTime $date_receipt): static
+    {
+        $this->date_receipt = $date_receipt;
+
+        return $this;
+    }
+
+    public function isWaiting(): ?bool
+    {
+        return $this->is_waiting;
+    }
+
+    public function setIsWaiting(bool $is_waiting): static
+    {
+        $this->is_waiting = $is_waiting;
+
+        return $this;
+    }
+
+    public function getLicencePlate(): ?string
+    {
+        return $this->licence_plate;
+    }
+
+    public function setLicencePlate(string $licence_plate): static
+    {
+        $this->licence_plate = $licence_plate;
+
+        return $this;
+    }
+
+    public function getIdCarrier(): ?carrier
+    {
+        return $this->id_carrier;
+    }
+
+    public function setIdCarrier(?carrier $id_carrier): static
+    {
+        $this->id_carrier = $id_carrier;
+
+        return $this;
+    }
+
+    public function getIdCarrier1(): ?vehicle
+    {
+        return $this->id_carrier_1;
+    }
+
+    public function setIdCarrier1(?vehicle $id_carrier_1): static
+    {
+        $this->id_carrier_1 = $id_carrier_1;
+
+        return $this;
+    }
+
+    public function getIdTruck(): ?Vehicle
+    {
+        return $this->id_truck;
+    }
+
+    public function setIdTruck(?Vehicle $id_truck): static
+    {
+        $this->id_truck = $id_truck;
+
+        return $this;
+    }
+
+    public function getLicencePlate1(): ?carrier
+    {
+        return $this->licence_plate_1;
+    }
+
+    public function setLicencePlate1(?carrier $licence_plate_1): static
+    {
+        $this->licence_plate_1 = $licence_plate_1;
+
+        return $this;
+    }
+
+    public function getIdVehicle(): ?Vehicle
+    {
+        return $this->id_vehicle;
+    }
+
+    public function setIdVehicle(?Vehicle $id_vehicle): static
+    {
+        $this->id_vehicle = $id_vehicle;
+
+        return $this;
+    }
+
+    public function getIdCustomer(): ?Customer
+    {
+        return $this->id_customer;
+    }
+
+    public function setIdCustomer(?Customer $id_customer): static
+    {
+        $this->id_customer = $id_customer;
+
+        return $this;
+    }
+
+    public function getBovineShipment(): ?BovineShipment
+    {
+        return $this->bovineShipment;
+    }
+
+    public function setBovineShipment(?BovineShipment $bovineShipment): static
+    {
+        $this->bovineShipment = $bovineShipment;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection<int, BovinShipment>
+     */
+    public function getIdType(): Collection
+    {
+        return $this->id_type;
+    }
+
+    public function addIdType(BovinShipment $idType): static
+    {
+        if (!$this->id_type->contains($idType)) {
+            $this->id_type->add($idType);
+            $idType->setIdShipment($this);
+        }
+
+        return $this;
+    }
+
+    public function removeIdType(BovinShipment $idType): static
+    {
+        if ($this->id_type->removeElement($idType)) {
+            // set the owning side to null (unless already changed)
+            if ($idType->getIdShipment() === $this) {
+                $idType->setIdShipment(null);
+            }
+        }
+
+        return $this;
+    }
+
+    public function getTest(): ?string
+    {
+        return $this->test;
+    }
+
+    public function setTest(string $test): static
+    {
+        $this->test = $test;
+
+        return $this;
+    }
+}
-- 
2.39.5


From e8189a4d0463ae3dd571680bf4b9a50ab23e94f2 Mon Sep 17 00:00:00 2001
From: Matteo <matteo@yuno.malio.fr>
Date: Tue, 3 Feb 2026 17:32:39 +0100
Subject: [PATCH 03/12] =?UTF-8?q?feat=20:=20mise=20=C3=A0=20jour=20du=20bo?=
 =?UTF-8?q?n=20de=20r=C3=A9ception=20WIP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml          | 35 +++++++++++++++++----------
 src/Entity/BovinShipment.php | 46 ++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dd56244..3fa597c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,15 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : mise à jour du bon de réception">
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : mise à jour du bon de réception WIP">
       <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$/src/Entity/Address.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Address.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Entity/Carrier.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Carrier.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Entity/Vehicle.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Vehicle.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/BovinShipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/BovinShipment.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -297,7 +292,7 @@
       <workItem from="1770055690365" duration="370000" />
       <workItem from="1770056515646" duration="21000" />
       <workItem from="1770102495553" duration="2280000" />
-      <workItem from="1770125858721" duration="9357000" />
+      <workItem from="1770125858721" duration="10216000" />
     </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" />
@@ -667,7 +662,23 @@
       <option name="project" value="LOCAL" />
       <updated>1769782099473</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="feat : mise à jour du bon de réception wip">
+      <option name="closed" value="true" />
+      <created>1770135384363</created>
+      <option name="number" value="00047" />
+      <option name="presentableId" value="LOCAL-00047" />
+      <option name="project" value="LOCAL" />
+      <updated>1770135384363</updated>
+    </task>
+    <task id="LOCAL-00048" summary="feat : mise à jour du bon de réception WIP">
+      <option name="closed" value="true" />
+      <created>1770135408267</created>
+      <option name="number" value="00048" />
+      <option name="presentableId" value="LOCAL-00048" />
+      <option name="project" value="LOCAL" />
+      <updated>1770135408267</updated>
+    </task>
+    <option name="localTasksCounter" value="49" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -717,8 +728,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="ci : ajout du script et de la doc déploiement" />
-    <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" />
@@ -742,7 +751,9 @@
     <MESSAGE value="feat : ajout de colonne pour les Supplier, Address et modification du numéro de réception" />
     <MESSAGE value="feat : ajout de colonne pour les Supplier, Address. Modification du numéro de réception et ajout de fixtures" />
     <MESSAGE value="feat : mise à jour du bon de réception" />
-    <option name="LAST_COMMIT_MESSAGE" value="feat : mise à jour du bon de réception" />
+    <MESSAGE value="feat : mise à jour du bon de réception wip" />
+    <MESSAGE value="feat : mise à jour du bon de réception WIP" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat : mise à jour du bon de réception WIP" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
diff --git a/src/Entity/BovinShipment.php b/src/Entity/BovinShipment.php
index 7d261a0..bf4b7c4 100644
--- a/src/Entity/BovinShipment.php
+++ b/src/Entity/BovinShipment.php
@@ -4,10 +4,56 @@ 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 Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'bovin_shipment')]
+#[ApiResource(
+    operations: [
+        new Get(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['bovin-shipment:read']],
+        ),
+        new GetCollection(
+            normalizationContext: ['groups' => ['bovin-shipment:read']],
+        ),
+        new Post(
+            normalizationContext: ['groups' => ['bovin-shipment:read']],
+            denormalizationContext: ['groups' => ['bovin-shipment:write']],
+        ),
+        new Patch(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['bovin-shipment:read']],
+            denormalizationContext: ['groups' => ['bovin-shipment:write']],
+        ),
+        //        new Get(
+        //            uriTemplate: '/receptions/weigh',
+        //            openapi: new OpenApiOperation(
+        //                summary: 'Fetch the current weight reading',
+        //                description: 'Queries the pont-bascule and returns the weight data.',
+        //            ),
+        //            normalizationContext: ['groups' => ['reception:weigh:read']],
+        //            output: PontBasculeReading::class,
+        //            provider: ReceptionWeighingProvider::class,
+        //        ),
+        //        new Get(
+        //            uriTemplate: '/receptions/{id}/receipt',
+        //            requirements: ['id' => '\d+'],
+        //            openapi: new OpenApiOperation(
+        //                summary: 'Render a reception receipt',
+        //                description: 'Returns a PDF receipt for the reception.',
+        //            ),
+        //            output: false,
+        //            provider: ReceptionReceiptProvider::class,
+        //        ),
+    ],
+)]
 class BovinShipment
 {
     #[ORM\Id]
-- 
2.39.5


From e249d44e784f414fbdb2ff6c44d8ef3aeb98d2aa Mon Sep 17 00:00:00 2001
From: Matteo <matteo@yuno.malio.fr>
Date: Tue, 3 Feb 2026 17:34:35 +0100
Subject: [PATCH 04/12] =?UTF-8?q?feat=20:=20mise=20=C3=A0=20jour=20du=20bo?=
 =?UTF-8?q?n=20de=20r=C3=A9ception=20WIP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3fa597c..afa2e6a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : mise à jour du bon de réception WIP">
-      <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$/src/Entity/BovinShipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/BovinShipment.php" afterDir="false" />
-    </list>
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : mise à jour du bon de réception WIP" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -292,7 +288,7 @@
       <workItem from="1770055690365" duration="370000" />
       <workItem from="1770056515646" duration="21000" />
       <workItem from="1770102495553" duration="2280000" />
-      <workItem from="1770125858721" duration="10216000" />
+      <workItem from="1770125858721" duration="10592000" />
     </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" />
@@ -678,7 +674,15 @@
       <option name="project" value="LOCAL" />
       <updated>1770135408267</updated>
     </task>
-    <option name="localTasksCounter" value="49" />
+    <task id="LOCAL-00049" summary="feat : mise à jour du bon de réception WIP">
+      <option name="closed" value="true" />
+      <created>1770136359244</created>
+      <option name="number" value="00049" />
+      <option name="presentableId" value="LOCAL-00049" />
+      <option name="project" value="LOCAL" />
+      <updated>1770136359244</updated>
+    </task>
+    <option name="localTasksCounter" value="50" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-- 
2.39.5


From ba4375f60918f2cf5d9a0a58f3cf5e101d845c8d Mon Sep 17 00:00:00 2001
From: Matteo <matteo@yuno.malio.fr>
Date: Wed, 4 Feb 2026 16:58:55 +0100
Subject: [PATCH 05/12] feat : Expedition dev back-end WIP

---
 .idea/workspace.xml                  |  77 +++++++--
 makefile                             |   2 +-
 migrations/Version20260203152543.php |  64 --------
 migrations/Version20260204101625.php |  64 ++++++++
 migrations/Version20260204102423.php |  35 ++++
 src/Entity/Address.php               |  49 +-----
 src/Entity/BovinShipment.php         |  50 ++----
 src/Entity/BovineTypeShipment.php    | 110 -------------
 src/Entity/Carrier.php               |  86 +---------
 src/Entity/Customer.php              | 101 +++++-------
 src/Entity/Shipment.php              | 230 +++++++++++----------------
 src/Entity/ShipmentType.php          |  71 +++++++++
 src/Entity/Vehicle.php               |  43 -----
 13 files changed, 396 insertions(+), 586 deletions(-)
 delete mode 100644 migrations/Version20260203152543.php
 create mode 100644 migrations/Version20260204101625.php
 create mode 100644 migrations/Version20260204102423.php
 delete mode 100644 src/Entity/BovineTypeShipment.php
 create mode 100644 src/Entity/ShipmentType.php

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index afa2e6a..d350ddf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,21 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : mise à jour du bon de réception WIP" />
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : Expedition dev back-end">
+      <change afterPath="$PROJECT_DIR$/migrations/Version20260204101625.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/migrations/Version20260204102423.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/makefile" beforeDir="false" afterPath="$PROJECT_DIR$/makefile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/migrations/Version20260203152543.php" beforeDir="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/BovineTypeShipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/ShipmentType.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Carrier.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Carrier.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Customer.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Customer.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Shipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Shipment.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Vehicle.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Vehicle.php" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -14,6 +28,11 @@
     <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
     <execution />
   </component>
+  <component name="CopilotPersistence">
+    <persistenceIdMap>
+      <entry key="_//wsl.localhost/Ubuntu-24.04/home/matte/Ferme" value="381AhnCm9yPeOiWgMObKHhtgv2C" />
+    </persistenceIdMap>
+  </component>
   <component name="EmbeddingIndexingInfo">
     <option name="cachedIndexableFilesCount" value="151" />
   </component>
@@ -220,15 +239,17 @@
     "RunOnceActivity.git.unshallow": "true",
     "RunOnceActivity.typescript.service.memoryLimit.init": "true",
     "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
+    "database.data.extractors.current.export.id": "Comma-separated (CSV)_id",
+    "database.data.extractors.current.id": "Comma-separated (CSV)_id",
     "git-widget-placeholder": "feat/271-expedition-etape-1",
     "junie.onboarding.icon.badge.shown": "true",
-    "last_opened_file_path": "/home/sroy/Documents/test/Ferme",
+    "last_opened_file_path": "//wsl.localhost/Ubuntu-24.04/home/matte/Ferme/frontend/services",
     "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.group.appearance",
+    "settings.editor.selected.configurable": "preferences.keymap",
     "to.speed.mode.migration.done": "true",
     "ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
     "vue.rearranger.settings.migration": "true"
@@ -246,6 +267,13 @@
   }
 }]]></component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\services" />
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\services\dto" />
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\stores" />
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\pages\shipment" />
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\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" />
@@ -257,7 +285,6 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-js-predefined-d6986cc7102b-9b0f141eb926-JavaScript-PS-253.30387.85" />
         <option value="bundled-php-predefined-a98d8de5180a-0e0d91225499-com.jetbrains.php.sharedIndexes-PS-253.30387.85" />
       </set>
     </attachedChunks>
@@ -288,15 +315,10 @@
       <workItem from="1770055690365" duration="370000" />
       <workItem from="1770056515646" duration="21000" />
       <workItem from="1770102495553" duration="2280000" />
-      <workItem from="1770125858721" duration="10592000" />
-    </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>
+      <workItem from="1770125858721" duration="10606000" />
+      <workItem from="1770188542722" duration="1032000" />
+      <workItem from="1770189650316" duration="5784000" />
+      <workItem from="1770195538424" duration="16730000" />
     </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" />
@@ -682,7 +704,15 @@
       <option name="project" value="LOCAL" />
       <updated>1770136359244</updated>
     </task>
-    <option name="localTasksCounter" value="50" />
+    <task id="LOCAL-00050" summary="feat : mise à jour du bon de réception WIP">
+      <option name="closed" value="true" />
+      <created>1770136475283</created>
+      <option name="number" value="00050" />
+      <option name="presentableId" value="LOCAL-00050" />
+      <option name="project" value="LOCAL" />
+      <updated>1770136475283</updated>
+    </task>
+    <option name="localTasksCounter" value="51" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -759,8 +789,27 @@
     <MESSAGE value="feat : mise à jour du bon de réception WIP" />
     <option name="LAST_COMMIT_MESSAGE" value="feat : mise à jour du bon de réception WIP" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/frontend/stores/reception.ts</url>
+          <properties lambdaOrdinal="-1" />
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
     <select />
   </component>
+  <component name="github-copilot-workspace">
+    <instructionFileLocations>
+      <option value=".github/instructions" />
+    </instructionFileLocations>
+    <promptFileLocations>
+      <option value=".github/prompts" />
+    </promptFileLocations>
+  </component>
 </project>
\ No newline at end of file
diff --git a/makefile b/makefile
index 0856c61..8065f4b 100644
--- a/makefile
+++ b/makefile
@@ -79,7 +79,7 @@ migration-migrate:
 	$(SYMFONY_CONSOLE) --no-interaction doctrine:migrations:migrate --allow-no-migration
 
 fixtures:
-	$(SYMFONY_CONSOLE) doctrine:fixtures:load
+	$(SYMFONY_CONSOLE) --no-interaction doctrine:fixtures:load
 
 # Attention, supprime votre bdd local
 db-reset:
diff --git a/migrations/Version20260203152543.php b/migrations/Version20260203152543.php
deleted file mode 100644
index ac37491..0000000
--- a/migrations/Version20260203152543.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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 Version20260203152543 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 bovin_shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, nb_bovin_send INT NOT NULL, shipment_id INT DEFAULT NULL, bovine_type_id INT DEFAULT NULL, PRIMARY KEY (id))');
-        $this->addSql('CREATE INDEX IDX_7049F4507BE036FC ON bovin_shipment (shipment_id)');
-        $this->addSql('CREATE INDEX IDX_7049F4507899F32E ON bovin_shipment (bovine_type_id)');
-        $this->addSql('CREATE TABLE bovine_type_shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, type_label VARCHAR(255) NOT NULL, type_code VARCHAR(255) NOT NULL, PRIMARY KEY (id))');
-        $this->addSql('CREATE TABLE customer (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, customer_label VARCHAR(255) NOT NULL, customer_code VARCHAR(255) NOT NULL, id_adress_id INT DEFAULT NULL, PRIMARY KEY (id))');
-        $this->addSql('CREATE INDEX IDX_81398E094B3458B ON customer (id_adress_id)');
-        $this->addSql('CREATE TABLE shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, date_receipt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, is_waiting BOOLEAN NOT NULL, licence_plate VARCHAR(255) NOT NULL, test VARCHAR(255) NOT NULL, id_carrier_id INT DEFAULT NULL, id_carrier_1_id INT DEFAULT NULL, id_truck_id INT DEFAULT NULL, licence_plate_1_id INT DEFAULT NULL, id_vehicle_id INT DEFAULT NULL, id_customer_id INT DEFAULT NULL, PRIMARY KEY (id))');
-        $this->addSql('CREATE INDEX IDX_2CB20DC84554740 ON shipment (id_carrier_id)');
-        $this->addSql('CREATE INDEX IDX_2CB20DC817F550F ON shipment (id_carrier_1_id)');
-        $this->addSql('CREATE INDEX IDX_2CB20DC964E905B ON shipment (id_truck_id)');
-        $this->addSql('CREATE INDEX IDX_2CB20DC3B17D73A ON shipment (licence_plate_1_id)');
-        $this->addSql('CREATE INDEX IDX_2CB20DCF1D99706 ON shipment (id_vehicle_id)');
-        $this->addSql('CREATE INDEX IDX_2CB20DC8B870E04 ON shipment (id_customer_id)');
-        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT FK_7049F4507BE036FC FOREIGN KEY (shipment_id) REFERENCES shipment (id)');
-        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT FK_7049F4507899F32E FOREIGN KEY (bovine_type_id) REFERENCES bovine_type_shipment (id)');
-        $this->addSql('ALTER TABLE customer ADD CONSTRAINT FK_81398E094B3458B FOREIGN KEY (id_adress_id) REFERENCES address (id)');
-        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC84554740 FOREIGN KEY (id_carrier_id) REFERENCES carrier (id)');
-        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC817F550F FOREIGN KEY (id_carrier_1_id) REFERENCES vehicle (id)');
-        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC964E905B FOREIGN KEY (id_truck_id) REFERENCES vehicle (id)');
-        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC3B17D73A FOREIGN KEY (licence_plate_1_id) REFERENCES carrier (id)');
-        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DCF1D99706 FOREIGN KEY (id_vehicle_id) REFERENCES vehicle (id)');
-        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC8B870E04 FOREIGN KEY (id_customer_id) REFERENCES customer (id)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT FK_7049F4507BE036FC');
-        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT FK_7049F4507899F32E');
-        $this->addSql('ALTER TABLE customer DROP CONSTRAINT FK_81398E094B3458B');
-        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC84554740');
-        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC817F550F');
-        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC964E905B');
-        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC3B17D73A');
-        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DCF1D99706');
-        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC8B870E04');
-        $this->addSql('DROP TABLE bovin_shipment');
-        $this->addSql('DROP TABLE bovine_type_shipment');
-        $this->addSql('DROP TABLE customer');
-        $this->addSql('DROP TABLE shipment');
-    }
-}
diff --git a/migrations/Version20260204101625.php b/migrations/Version20260204101625.php
new file mode 100644
index 0000000..9dd7038
--- /dev/null
+++ b/migrations/Version20260204101625.php
@@ -0,0 +1,64 @@
+<?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 Version20260204101625 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 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 TABLE customer (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(255) NOT NULL, code VARCHAR(255) NOT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE TABLE customer_address (customer_id INT NOT NULL, address_id INT NOT NULL, PRIMARY KEY (customer_id, address_id))');
+        $this->addSql('CREATE INDEX IDX_1193CB3F9395C3F3 ON customer_address (customer_id)');
+        $this->addSql('CREATE INDEX IDX_1193CB3FF5B7AF75 ON customer_address (address_id)');
+        $this->addSql('CREATE TABLE shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, licence_plate VARCHAR(255) NOT NULL, identification_number VARCHAR(20) DEFAULT NULL, current_step INT DEFAULT 0 NOT NULL, is_valid BOOLEAN NOT NULL, shipment_date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, carrier_id INT DEFAULT NULL, vehicle_id INT DEFAULT NULL, truck_id INT DEFAULT NULL, customer_id INT DEFAULT NULL, PRIMARY KEY (id))');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_2CB20DC347639A5 ON shipment (identification_number)');
+        $this->addSql('CREATE INDEX IDX_2CB20DC21DFC797 ON shipment (carrier_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DC545317D1 ON shipment (vehicle_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DCC6957CCE ON shipment (truck_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DC9395C3F3 ON shipment (customer_id)');
+        $this->addSql('CREATE TABLE shipment_type (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(255) NOT NULL, code VARCHAR(255) NOT NULL, PRIMARY KEY (id))');
+        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT FK_7049F4507BE036FC FOREIGN KEY (shipment_id) REFERENCES shipment (id)');
+        $this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT FK_7049F4502EE48A36 FOREIGN KEY (shipment_type_id) REFERENCES shipment_type (id)');
+        $this->addSql('ALTER TABLE customer_address ADD CONSTRAINT FK_1193CB3F9395C3F3 FOREIGN KEY (customer_id) REFERENCES customer (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE customer_address ADD CONSTRAINT FK_1193CB3FF5B7AF75 FOREIGN KEY (address_id) REFERENCES address (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC21DFC797 FOREIGN KEY (carrier_id) REFERENCES carrier (id) NOT DEFERRABLE');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC545317D1 FOREIGN KEY (vehicle_id) REFERENCES vehicle (id)');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DCC6957CCE FOREIGN KEY (truck_id) REFERENCES truck (id) NOT DEFERRABLE');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC9395C3F3 FOREIGN KEY (customer_id) REFERENCES customer (id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT FK_7049F4507BE036FC');
+        $this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT FK_7049F4502EE48A36');
+        $this->addSql('ALTER TABLE customer_address DROP CONSTRAINT FK_1193CB3F9395C3F3');
+        $this->addSql('ALTER TABLE customer_address DROP CONSTRAINT FK_1193CB3FF5B7AF75');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC21DFC797');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC545317D1');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DCC6957CCE');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC9395C3F3');
+        $this->addSql('DROP TABLE bovin_shipment');
+        $this->addSql('DROP TABLE customer');
+        $this->addSql('DROP TABLE customer_address');
+        $this->addSql('DROP TABLE shipment');
+        $this->addSql('DROP TABLE shipment_type');
+    }
+}
diff --git a/migrations/Version20260204102423.php b/migrations/Version20260204102423.php
new file mode 100644
index 0000000..7db4507
--- /dev/null
+++ b/migrations/Version20260204102423.php
@@ -0,0 +1,35 @@
+<?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 Version20260204102423 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 shipment DROP CONSTRAINT fk_2cb20dc545317d1');
+        $this->addSql('DROP INDEX idx_2cb20dc545317d1');
+        $this->addSql('ALTER TABLE shipment DROP vehicle_id');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE shipment ADD vehicle_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT fk_2cb20dc545317d1 FOREIGN KEY (vehicle_id) REFERENCES vehicle (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX idx_2cb20dc545317d1 ON shipment (vehicle_id)');
+    }
+}
diff --git a/src/Entity/Address.php b/src/Entity/Address.php
index c06a159..e51450c 100644
--- a/src/Entity/Address.php
+++ b/src/Entity/Address.php
@@ -35,27 +35,27 @@ class Address
     private ?int $id = null;
 
     #[ORM\Column(length: 120)]
-    #[Groups(['address:read', 'supplier:read', 'reception:read'])]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read'])]
     private string $label = '';
 
     #[ORM\Column(length: 180)]
-    #[Groups(['address:read', 'supplier:read', 'reception:read'])]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read'])]
     private string $street = '';
 
     #[ORM\Column(name: 'street2', length: 180, nullable: true)]
-    #[Groups(['address:read', 'supplier:read', 'reception:read'])]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read'])]
     private ?string $street2 = null;
 
     #[ORM\Column(name: 'postal_code', length: 20)]
-    #[Groups(['address:read', 'supplier:read', 'reception:read'])]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read'])]
     private string $postalCode = '';
 
     #[ORM\Column(length: 120)]
-    #[Groups(['address:read', 'supplier:read', 'reception:read'])]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read'])]
     private string $city = '';
 
     #[ORM\Column(name: 'country_code', length: 2)]
-    #[Groups(['address:read', 'supplier:read'])]
+    #[Groups(['address:read', 'supplier:read', 'customer:read'])]
     private string $countryCode = '';
 
     /**
@@ -64,16 +64,9 @@ class Address
     #[ORM\ManyToMany(targetEntity: Supplier::class, mappedBy: 'addresses')]
     private Collection $suppliers;
 
-    /**
-     * @var Collection<int, Customer>
-     */
-    #[ORM\OneToMany(targetEntity: Customer::class, mappedBy: 'id_adress')]
-    private Collection $customers;
-
     public function __construct()
     {
         $this->suppliers = new ArrayCollection();
-        $this->customers = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -172,34 +165,4 @@ class Address
     {
         return $this->suppliers;
     }
-
-    /**
-     * @return Collection<int, Customer>
-     */
-    public function getCustomers(): Collection
-    {
-        return $this->customers;
-    }
-
-    public function addCustomer(Customer $customer): static
-    {
-        if (!$this->customers->contains($customer)) {
-            $this->customers->add($customer);
-            $customer->setIdAdress($this);
-        }
-
-        return $this;
-    }
-
-    public function removeCustomer(Customer $customer): static
-    {
-        if ($this->customers->removeElement($customer)) {
-            // set the owning side to null (unless already changed)
-            if ($customer->getIdAdress() === $this) {
-                $customer->setIdAdress(null);
-            }
-        }
-
-        return $this;
-    }
 }
diff --git a/src/Entity/BovinShipment.php b/src/Entity/BovinShipment.php
index bf4b7c4..e538215 100644
--- a/src/Entity/BovinShipment.php
+++ b/src/Entity/BovinShipment.php
@@ -7,8 +7,6 @@ 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;
 
@@ -23,15 +21,7 @@ use Symfony\Component\Serializer\Attribute\Groups;
         new GetCollection(
             normalizationContext: ['groups' => ['bovin-shipment:read']],
         ),
-        new Post(
-            normalizationContext: ['groups' => ['bovin-shipment:read']],
-            denormalizationContext: ['groups' => ['bovin-shipment:write']],
-        ),
-        new Patch(
-            requirements: ['id' => '\d+'],
-            normalizationContext: ['groups' => ['bovin-shipment:read']],
-            denormalizationContext: ['groups' => ['bovin-shipment:write']],
-        ),
+
         //        new Get(
         //            uriTemplate: '/receptions/weigh',
         //            openapi: new OpenApiOperation(
@@ -62,16 +52,16 @@ class BovinShipment
     #[Groups(['shipment:read', 'bovine-shipment:read'])]
     private ?int $id = null;
 
-    #[ORM\ManyToOne(inversedBy: 'shipment')]
-    #[Groups(['shipment:read', 'shipment:write', 'bovine-shipment:read', 'bovine-shipment:write'])]
-    private ?Shipment $Shipment = null;
+    #[ORM\ManyToOne(inversedBy: 'shipment_types')]
+    #[Groups(['bovine-shipment:read'])]
+    private ?Shipment $shipment = null;
 
-    #[ORM\ManyToOne(inversedBy: 'bovinShipments')]
-    #[Groups(['shipment:read', 'shipment:write', 'bovine-shipment:read', 'bovine-shipment:write'])]
-    private ?BovineTypeShipment $BovineType = null;
+    #[ORM\ManyToOne]
+    #[Groups(['shipment:read', 'bovine-shipment:read'])]
+    private ?ShipmentType $shipmentType = null;
 
     #[ORM\Column]
-    #[Groups(['shipment:read', 'shipment:write', 'bovine-shipment:read', 'bovine-shipment:write'])]
+    #[Groups(['shipment:read', 'bovine-shipment:read'])]
     private ?int $nbBovinSend = null;
 
     public function getId(): ?int
@@ -79,28 +69,24 @@ class BovinShipment
         return $this->id;
     }
 
-    public function getIdShipment(): ?Shipment
+    public function getShipment(): ?Shipment
     {
-        return $this->Shipment;
+        return $this->shipment;
     }
 
-    public function setIdShipment(?Shipment $Shipment): static
+    public function setShipment(?Shipment $shipment): void
     {
-        $this->Shipment = $Shipment;
-
-        return $this;
+        $this->shipment = $shipment;
     }
 
-    public function getIdType(): ?BovineTypeShipment
+    public function getShipmentType(): ?ShipmentType
     {
-        return $this->BovineType;
+        return $this->shipmentType;
     }
 
-    public function setIdType(?BovineTypeShipment $BovineType): static
+    public function setShipmentType(?ShipmentType $shipmentType): void
     {
-        $this->BovineType = $BovineType;
-
-        return $this;
+        $this->shipmentType = $shipmentType;
     }
 
     public function getNbBovinSend(): ?int
@@ -108,10 +94,8 @@ class BovinShipment
         return $this->nbBovinSend;
     }
 
-    public function setNbBovinSend(int $nbBovinSend): static
+    public function setNbBovinSend(?int $nbBovinSend): void
     {
         $this->nbBovinSend = $nbBovinSend;
-
-        return $this;
     }
 }
diff --git a/src/Entity/BovineTypeShipment.php b/src/Entity/BovineTypeShipment.php
deleted file mode 100644
index f333fdc..0000000
--- a/src/Entity/BovineTypeShipment.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Entity;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
-
-#[ORM\Entity]
-class BovineTypeShipment
-{
-    #[ORM\Id]
-    #[ORM\GeneratedValue]
-    #[ORM\Column]
-    #[Groups(['shipment:read', 'bovine-type:read'])]
-    private ?int $id = null;
-
-    #[ORM\Column(length: 255)]
-    #[Groups(['shipment:read', 'shipment:write', 'bovine-type:read', 'bovine-type:write'])]
-    private ?string $type_label = null;
-
-    #[ORM\Column(length: 255)]
-    #[Groups(['shipment:read', 'shipment:write', 'bovine-type:read', 'bovine-type:write'])]
-    private ?string $type_code = null;
-
-    /**
-     * @var Collection<int, BovinShipment>
-     */
-    #[ORM\OneToMany(targetEntity: BovinShipment::class, mappedBy: 'id_type')]
-    #[Groups(['shipment:read', 'shipment:write', 'bovine-type:read', 'bovine-type:write'])]
-    private Collection $bovinShipments;
-
-    public function __construct()
-    {
-        $this->bovinShipments = new ArrayCollection();
-    }
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getTypeLabel(): ?string
-    {
-        return $this->type_label;
-    }
-
-    public function setTypeLabel(string $type_label): static
-    {
-        $this->type_label = $type_label;
-
-        return $this;
-    }
-
-    public function getTypeCode(): ?string
-    {
-        return $this->type_code;
-    }
-
-    public function setTypeCode(string $type_code): static
-    {
-        $this->type_code = $type_code;
-
-        return $this;
-    }
-
-    public function getBovineShipment(): ?BovineShipment
-    {
-        return $this->bovineShipment;
-    }
-
-    public function setBovineShipment(?BovineShipment $bovineShipment): static
-    {
-        $this->bovineShipment = $bovineShipment;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection<int, BovinShipment>
-     */
-    public function getBovinShipments(): Collection
-    {
-        return $this->bovinShipments;
-    }
-
-    public function addBovinShipment(BovinShipment $bovinShipment): static
-    {
-        if (!$this->bovinShipments->contains($bovinShipment)) {
-            $this->bovinShipments->add($bovinShipment);
-            $bovinShipment->setIdType($this);
-        }
-
-        return $this;
-    }
-
-    public function removeBovinShipment(BovinShipment $bovinShipment): static
-    {
-        if ($this->bovinShipments->removeElement($bovinShipment)) {
-            // set the owning side to null (unless already changed)
-            if ($bovinShipment->getIdType() === $this) {
-                $bovinShipment->setIdType(null);
-            }
-        }
-
-        return $this;
-    }
-}
diff --git a/src/Entity/Carrier.php b/src/Entity/Carrier.php
index 5f9ace4..a520eda 100644
--- a/src/Entity/Carrier.php
+++ b/src/Entity/Carrier.php
@@ -7,8 +7,6 @@ namespace App\Entity;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;
 
@@ -31,35 +29,17 @@ class Carrier
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column]
-    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read'])]
+    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read', 'shipment:read'])]
     private ?int $id = null;
 
     #[ORM\Column(length: 180)]
-    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read'])]
+    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read', 'shipment:read'])]
     private string $name = '';
 
     #[ORM\Column(length: 30, nullable: true)]
-    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read'])]
+    #[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read', 'shipment:read'])]
     private ?string $code = null;
 
-    /**
-     * @var Collection<int, Shipment>
-     */
-    #[ORM\OneToMany(targetEntity: Shipment::class, mappedBy: 'id_carrier')]
-    private Collection $id_carrier_1;
-
-    /**
-     * @var Collection<int, Shipment>
-     */
-    #[ORM\OneToMany(targetEntity: Shipment::class, mappedBy: 'licence_plate_1')]
-    private Collection $shipments;
-
-    public function __construct()
-    {
-        $this->id_carrier_1 = new ArrayCollection();
-        $this->shipments    = new ArrayCollection();
-    }
-
     public function getId(): ?int
     {
         return $this->id;
@@ -88,64 +68,4 @@ class Carrier
 
         return $this;
     }
-
-    /**
-     * @return Collection<int, Shipment>
-     */
-    public function getIdCarrier1(): Collection
-    {
-        return $this->id_carrier_1;
-    }
-
-    public function addIdCarrier1(Shipment $idCarrier1): static
-    {
-        if (!$this->id_carrier_1->contains($idCarrier1)) {
-            $this->id_carrier_1->add($idCarrier1);
-            $idCarrier1->setIdCarrier($this);
-        }
-
-        return $this;
-    }
-
-    public function removeIdCarrier1(Shipment $idCarrier1): static
-    {
-        if ($this->id_carrier_1->removeElement($idCarrier1)) {
-            // set the owning side to null (unless already changed)
-            if ($idCarrier1->getIdCarrier() === $this) {
-                $idCarrier1->setIdCarrier(null);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return Collection<int, Shipment>
-     */
-    public function getShipments(): Collection
-    {
-        return $this->shipments;
-    }
-
-    public function addShipment(Shipment $shipment): static
-    {
-        if (!$this->shipments->contains($shipment)) {
-            $this->shipments->add($shipment);
-            $shipment->setLicencePlate1($this);
-        }
-
-        return $this;
-    }
-
-    public function removeShipment(Shipment $shipment): static
-    {
-        if ($this->shipments->removeElement($shipment)) {
-            // set the owning side to null (unless already changed)
-            if ($shipment->getLicencePlate1() === $this) {
-                $shipment->setLicencePlate1(null);
-            }
-        }
-
-        return $this;
-    }
 }
diff --git a/src/Entity/Customer.php b/src/Entity/Customer.php
index 03bcbcd..ad6e09c 100644
--- a/src/Entity/Customer.php
+++ b/src/Entity/Customer.php
@@ -4,11 +4,29 @@ declare(strict_types=1);
 
 namespace App\Entity;
 
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
 
 #[ORM\Entity]
+#[ORM\Table(name: 'customer')]
+#[ApiResource(
+    operations: [
+        new Get(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['customer:read']],
+        ),
+        new GetCollection(
+            normalizationContext: ['groups' => ['customer:read']],
+        ),
+    ],
+    security: "is_granted('ROLE_USER')",
+)]
 class Customer
 {
     #[ORM\Id]
@@ -18,26 +36,25 @@ class Customer
     private ?int $id = null;
 
     #[ORM\Column(length: 255)]
-    #[Groups(['shipment:read', 'shipment:write', 'customer:read', 'customer:write'])]
-    private ?string $customer_label = null;
+    #[Groups(['customer:read', 'shipment:read'])]
+    private ?string $label = null;
 
     #[ORM\Column(length: 255)]
-    #[Groups(['shipment:read', 'shipment:write', 'customer:read', 'customer:write'])]
-    private ?string $customer_code = null;
-
-    #[ORM\ManyToOne(inversedBy: 'customers')]
-    #[Groups(['shipment:read', 'shipment:write', 'customer:read', 'customer:write'])]
-    private ?Address $id_adress = null;
+    #[Groups(['customer:read', 'shipment:read'])]
+    private ?string $code = null;
 
     /**
-     * @var Collection<int, Shipment>
+     * @var Collection<int, Address>
      */
-    #[ORM\OneToMany(targetEntity: Shipment::class, mappedBy: 'id_customer')]
-    private Collection $shipments;
+    #[ORM\ManyToMany(targetEntity: Address::class, inversedBy: 'customers')]
+    #[ORM\JoinTable(name: 'customer_address')]
+    #[Groups(['customer:read'])]
+    #[ApiProperty(readableLink: true)]
+    private Collection $addresses;
 
     public function __construct()
     {
-        $this->shipments = new ArrayCollection();
+        $this->addresses = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -45,69 +62,33 @@ class Customer
         return $this->id;
     }
 
-    public function getCustomerLabel(): ?string
+    public function getLabel(): ?string
     {
-        return $this->customer_label;
+        return $this->label;
     }
 
-    public function setCustomerLabel(string $customer_label): static
+    public function setLabel(?string $label): void
     {
-        $this->customer_label = $customer_label;
-
-        return $this;
+        $this->label = $label;
     }
 
-    public function getCustomerCode(): ?string
+    public function getCode(): ?string
     {
-        return $this->customer_code;
+        return $this->code;
     }
 
-    public function setCustomerCode(string $customer_code): static
+    public function setCode(?string $code): void
     {
-        $this->customer_code = $customer_code;
-
-        return $this;
+        $this->code = $code;
     }
 
-    public function getIdAdress(): ?Address
+    public function getAddresses(): Collection
     {
-        return $this->id_adress;
+        return $this->addresses;
     }
 
-    public function setIdAdress(?Address $id_adress): static
+    public function setAddresses(Collection $addresses): void
     {
-        $this->id_adress = $id_adress;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection<int, Shipment>
-     */
-    public function getShipments(): Collection
-    {
-        return $this->shipments;
-    }
-
-    public function addShipment(Shipment $shipment): static
-    {
-        if (!$this->shipments->contains($shipment)) {
-            $this->shipments->add($shipment);
-            $shipment->setIdCustomer($this);
-        }
-
-        return $this;
-    }
-
-    public function removeShipment(Shipment $shipment): static
-    {
-        if ($this->shipments->removeElement($shipment)) {
-            // set the owning side to null (unless already changed)
-            if ($shipment->getIdCustomer() === $this) {
-                $shipment->setIdCustomer(null);
-            }
-        }
-
-        return $this;
+        $this->addresses = $addresses;
     }
 }
diff --git a/src/Entity/Shipment.php b/src/Entity/Shipment.php
index 74a5299..24f41a5 100644
--- a/src/Entity/Shipment.php
+++ b/src/Entity/Shipment.php
@@ -4,16 +4,18 @@ declare(strict_types=1);
 
 namespace App\Entity;
 
+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 DateTime;
-use Doctrine\Common\Collections\ArrayCollection;
+use DateTimeImmutable;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Context;
 use Symfony\Component\Serializer\Attribute\Groups;
+use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'shipment')]
@@ -36,24 +38,24 @@ use Symfony\Component\Serializer\Attribute\Groups;
             denormalizationContext: ['groups' => ['shipment:write']],
         ),
         //        new Get(
-        //            uriTemplate: '/receptions/weigh',
+        //            uriTemplate: '/shipments/weigh',
         //            openapi: new OpenApiOperation(
         //                summary: 'Fetch the current weight reading',
         //                description: 'Queries the pont-bascule and returns the weight data.',
         //            ),
-        //            normalizationContext: ['groups' => ['reception:weigh:read']],
+        //            normalizationContext: ['groups' => ['shipment:weigh:read']],
         //            output: PontBasculeReading::class,
-        //            provider: ReceptionWeighingProvider::class,
+        //            provider: shipmentWeighingProvider::class,
         //        ),
         //        new Get(
-        //            uriTemplate: '/receptions/{id}/receipt',
+        //            uriTemplate: '/shipments/{id}/receipt',
         //            requirements: ['id' => '\d+'],
         //            openapi: new OpenApiOperation(
-        //                summary: 'Render a reception receipt',
-        //                description: 'Returns a PDF receipt for the reception.',
+        //                summary: 'Render a shipment receipt',
+        //                description: 'Returns a PDF receipt for the shipment.',
         //            ),
         //            output: false,
-        //            provider: ReceptionReceiptProvider::class,
+        //            provider: shipmentReceiptProvider::class,
         //        ),
     ],
 )]
@@ -65,54 +67,53 @@ class Shipment
     #[Groups(['shipment:read'])]
     private ?int $id = null;
 
-    #[ORM\Column]
-    #[Groups(['shipment:read', 'shipment:write'])]
-    private ?DateTime $date_receipt = null;
-
-    #[ORM\Column]
-    #[Groups(['shipment:read', 'shipment:write'])]
-    private ?bool $is_waiting = null;
-
     #[ORM\Column(length: 255)]
     #[Groups(['shipment:read', 'shipment:write'])]
-    private ?string $licence_plate = null;
+    private ?string $licencePlate = null;
 
-    #[ORM\ManyToOne(inversedBy: 'id_carrier_1')]
-    #[Groups(['shipment:read', 'shipment:write'])]
-    private ?carrier $id_carrier = null;
+    #[ORM\Column(length: 20, unique: true, nullable: true)]
+    #[Groups(['shipment:read'])]
+    private ?string $identificationNumber = null;
 
-    #[ORM\ManyToOne(inversedBy: 'shipments')]
+    #[ORM\Column(options: ['default' => 0])]
     #[Groups(['shipment:read', 'shipment:write'])]
-    private ?vehicle $id_carrier_1 = null;
+    private int $currentStep = 0;
 
-    #[ORM\ManyToOne(inversedBy: 'shipments')]
+    #[ORM\Column]
     #[Groups(['shipment:read', 'shipment:write'])]
-    private ?Vehicle $id_truck = null;
+    private ?bool $isValid = null;
 
-    #[ORM\ManyToOne(inversedBy: 'shipments')]
+    #[ORM\Column(name: 'shipment_date', type: 'datetime_immutable')]
     #[Groups(['shipment:read', 'shipment:write'])]
-    private ?carrier $licence_plate_1 = null;
+    #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
+    private ?DateTimeImmutable $shipmentDate = null;
 
-    #[ORM\ManyToOne(inversedBy: 'shipments')]
+    #[ORM\ManyToOne]
+    #[ORM\JoinColumn(nullable: true)]
     #[Groups(['shipment:read', 'shipment:write'])]
-    private ?Vehicle $id_vehicle = null;
+    #[ApiProperty(readableLink: true)]
+    private ?Carrier $carrier = null;
 
-    #[ORM\ManyToOne(inversedBy: 'shipments')]
+    #[ORM\ManyToOne]
+    #[ORM\JoinColumn(nullable: true)]
     #[Groups(['shipment:read', 'shipment:write'])]
-    private ?Customer $id_customer = null;
+    #[ApiProperty(readableLink: true)]
+    private ?Truck $truck = null;
+
+    #[ORM\ManyToOne]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private ?Customer $customer = null;
 
     /**
      * @var Collection<int, BovinShipment>
      */
-    #[ORM\OneToMany(targetEntity: BovinShipment::class, mappedBy: 'id_shipment')]
-    private Collection $id_type;
+    #[ORM\OneToMany(targetEntity: BovinShipment::class, mappedBy: 'shipment')]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    private Collection $bovinShipments;
 
-    #[ORM\Column(length: 255)]
-    private ?string $test = null;
-
-    public function __construct()
+    public function __construct(Collection $bovinShipments)
     {
-        $this->id_type = new ArrayCollection();
+        $this->bovinShipments = $bovinShipments;
     }
 
     public function getId(): ?int
@@ -120,165 +121,124 @@ class Shipment
         return $this->id;
     }
 
-    public function getDateReceipt(): ?DateTime
-    {
-        return $this->date_receipt;
-    }
-
-    public function setDateReceipt(DateTime $date_receipt): static
-    {
-        $this->date_receipt = $date_receipt;
-
-        return $this;
-    }
-
-    public function isWaiting(): ?bool
-    {
-        return $this->is_waiting;
-    }
-
-    public function setIsWaiting(bool $is_waiting): static
-    {
-        $this->is_waiting = $is_waiting;
-
-        return $this;
-    }
-
     public function getLicencePlate(): ?string
     {
-        return $this->licence_plate;
+        return $this->licencePlate;
     }
 
-    public function setLicencePlate(string $licence_plate): static
+    public function setLicencePlate(?string $licencePlate): void
     {
-        $this->licence_plate = $licence_plate;
-
-        return $this;
+        $this->licencePlate = $licencePlate;
     }
 
-    public function getIdCarrier(): ?carrier
+    public function getIdentificationNumber(): ?string
     {
-        return $this->id_carrier;
+        return $this->identificationNumber;
     }
 
-    public function setIdCarrier(?carrier $id_carrier): static
+    public function setIdentificationNumber(?string $identificationNumber): void
     {
-        $this->id_carrier = $id_carrier;
-
-        return $this;
+        $this->identificationNumber = $identificationNumber;
     }
 
-    public function getIdCarrier1(): ?vehicle
+    public function getCurrentStep(): int
     {
-        return $this->id_carrier_1;
+        return $this->currentStep;
     }
 
-    public function setIdCarrier1(?vehicle $id_carrier_1): static
+    public function setCurrentStep(int $currentStep): void
     {
-        $this->id_carrier_1 = $id_carrier_1;
-
-        return $this;
+        $this->currentStep = $currentStep;
     }
 
-    public function getIdTruck(): ?Vehicle
+    public function getIsValid(): ?bool
     {
-        return $this->id_truck;
+        return $this->isValid;
     }
 
-    public function setIdTruck(?Vehicle $id_truck): static
+    public function setIsValid(?bool $isValid): void
     {
-        $this->id_truck = $id_truck;
-
-        return $this;
+        $this->isValid = $isValid;
     }
 
-    public function getLicencePlate1(): ?carrier
+    public function getShipmentDate(): ?DateTimeImmutable
     {
-        return $this->licence_plate_1;
+        return $this->shipmentDate;
     }
 
-    public function setLicencePlate1(?carrier $licence_plate_1): static
+    public function setShipmentDate(?DateTimeImmutable $shipmentDate): void
     {
-        $this->licence_plate_1 = $licence_plate_1;
-
-        return $this;
+        $this->shipmentDate = $shipmentDate;
     }
 
-    public function getIdVehicle(): ?Vehicle
+    public function getCarrier(): ?Carrier
     {
-        return $this->id_vehicle;
+        return $this->carrier;
     }
 
-    public function setIdVehicle(?Vehicle $id_vehicle): static
+    public function setCarrier(?Carrier $carrier): void
     {
-        $this->id_vehicle = $id_vehicle;
-
-        return $this;
+        $this->carrier = $carrier;
     }
 
-    public function getIdCustomer(): ?Customer
+    public function getVehicle(): ?Vehicle
     {
-        return $this->id_customer;
+        return $this->vehicle;
     }
 
-    public function setIdCustomer(?Customer $id_customer): static
+    public function setVehicle(?Vehicle $vehicle): void
     {
-        $this->id_customer = $id_customer;
-
-        return $this;
+        $this->vehicle = $vehicle;
     }
 
-    public function getBovineShipment(): ?BovineShipment
+    public function getTruck(): ?Truck
     {
-        return $this->bovineShipment;
+        return $this->truck;
     }
 
-    public function setBovineShipment(?BovineShipment $bovineShipment): static
+    public function setTruck(?Truck $truck): void
     {
-        $this->bovineShipment = $bovineShipment;
-
-        return $this;
+        $this->truck = $truck;
     }
 
-    /**
-     * @return Collection<int, BovinShipment>
-     */
-    public function getIdType(): Collection
+    public function getCustomer(): ?Customer
     {
-        return $this->id_type;
+        return $this->customer;
     }
 
-    public function addIdType(BovinShipment $idType): static
+    public function setCustomer(?Customer $customer): void
     {
-        if (!$this->id_type->contains($idType)) {
-            $this->id_type->add($idType);
-            $idType->setIdShipment($this);
+        $this->customer = $customer;
+    }
+
+    public function getBovinShipments(): Collection
+    {
+        return $this->bovinShipments;
+    }
+
+    public function setBovinShipments(Collection $bovinShipments): void
+    {
+        $this->bovinShipments = $bovinShipments;
+    }
+
+    public function addPelletBuilding(BovinShipment $bovinShipments): self
+    {
+        if (!$this->bovinShipments->contains($bovinShipments)) {
+            $this->bovinShipments->add($bovinShipments);
+            $bovinShipments->setReception($this);
         }
 
         return $this;
     }
 
-    public function removeIdType(BovinShipment $idType): static
+    public function removePelletBuilding(BovinShipment $bovinShipments): self
     {
-        if ($this->id_type->removeElement($idType)) {
-            // set the owning side to null (unless already changed)
-            if ($idType->getIdShipment() === $this) {
-                $idType->setIdShipment(null);
+        if ($this->bovinShipments->removeElement($bovinShipments)) {
+            if ($bovinShipments->getReception() === $this) {
+                $bovinShipments->setReception(null);
             }
         }
 
         return $this;
     }
-
-    public function getTest(): ?string
-    {
-        return $this->test;
-    }
-
-    public function setTest(string $test): static
-    {
-        $this->test = $test;
-
-        return $this;
-    }
 }
diff --git a/src/Entity/ShipmentType.php b/src/Entity/ShipmentType.php
new file mode 100644
index 0000000..0be6bc8
--- /dev/null
+++ b/src/Entity/ShipmentType.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\GetCollection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Attribute\Groups;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'shipment_type')]
+#[ApiResource(
+    operations: [
+        new Get(
+            requirements: ['id' => '\d+'],
+            normalizationContext: ['groups' => ['shipment-type:read']],
+        ),
+        new GetCollection(
+            normalizationContext: ['groups' => ['shipment-type:read']],
+        ),
+    ],
+    security: "is_granted('ROLE_USER')",
+)]
+class ShipmentType
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    #[Groups(['shipment-type:read', 'shipment:read'])]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['shipment-type:read', 'shipment:read'])]
+    private ?string $label = null;
+
+    #[ORM\Column(length: 255)]
+    #[Groups(['shipment-type:read', 'shipment:read'])]
+    private ?string $code = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getLabel(): ?string
+    {
+        return $this->label;
+    }
+
+    public function setLabel(string $label): static
+    {
+        $this->label = $label;
+
+        return $this;
+    }
+
+    public function getCode(): ?string
+    {
+        return $this->code;
+    }
+
+    public function setCode(string $code): self
+    {
+        $this->code = $code;
+
+        return $this;
+    }
+}
diff --git a/src/Entity/Vehicle.php b/src/Entity/Vehicle.php
index ea6ec10..6a849ed 100644
--- a/src/Entity/Vehicle.php
+++ b/src/Entity/Vehicle.php
@@ -8,8 +8,6 @@ use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Groups;
 
@@ -51,17 +49,6 @@ class Vehicle
     #[ApiProperty(readableLink: true)]
     private ?Truck $truck = null;
 
-    /**
-     * @var Collection<int, Shipment>
-     */
-    #[ORM\OneToMany(targetEntity: Shipment::class, mappedBy: 'id_carrier_1')]
-    private Collection $shipments;
-
-    public function __construct()
-    {
-        $this->shipments = new ArrayCollection();
-    }
-
     public function getId(): ?int
     {
         return $this->id;
@@ -102,34 +89,4 @@ class Vehicle
 
         return $this;
     }
-
-    /**
-     * @return Collection<int, Shipment>
-     */
-    public function getShipments(): Collection
-    {
-        return $this->shipments;
-    }
-
-    public function addShipment(Shipment $shipment): static
-    {
-        if (!$this->shipments->contains($shipment)) {
-            $this->shipments->add($shipment);
-            $shipment->setIdCarrier1($this);
-        }
-
-        return $this;
-    }
-
-    public function removeShipment(Shipment $shipment): static
-    {
-        if ($this->shipments->removeElement($shipment)) {
-            // set the owning side to null (unless already changed)
-            if ($shipment->getIdCarrier1() === $this) {
-                $shipment->setIdCarrier1(null);
-            }
-        }
-
-        return $this;
-    }
 }
-- 
2.39.5


From 69d047fca078ce4220be72b3b3e8d9231566352c Mon Sep 17 00:00:00 2001
From: Matteo <matteo@yuno.malio.fr>
Date: Thu, 5 Feb 2026 09:10:52 +0100
Subject: [PATCH 06/12] =?UTF-8?q?feat=20:=20#271=20-Cr=C3=A9er=20une=20nou?=
 =?UTF-8?q?velle=20exp=C3=A9dition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/data_source_mapping.xml |   6 ++
 .idea/workspace.xml           | 100 +++++++++++++++-------------------
 2 files changed, 51 insertions(+), 55 deletions(-)
 create mode 100644 .idea/data_source_mapping.xml

diff --git a/.idea/data_source_mapping.xml b/.idea/data_source_mapping.xml
new file mode 100644
index 0000000..9036044
--- /dev/null
+++ b/.idea/data_source_mapping.xml
@@ -0,0 +1,6 @@
+<?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" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d350ddf..ff03320 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,20 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : Expedition dev back-end">
-      <change afterPath="$PROJECT_DIR$/migrations/Version20260204101625.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/migrations/Version20260204102423.php" afterDir="false" />
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : Expedition dev back-end WIP">
       <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$/makefile" beforeDir="false" afterPath="$PROJECT_DIR$/makefile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/migrations/Version20260203152543.php" beforeDir="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/BovineTypeShipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/ShipmentType.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Entity/Carrier.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Carrier.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Entity/Customer.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Customer.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Entity/Shipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Shipment.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Entity/Vehicle.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Vehicle.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -231,41 +220,41 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.MCP Project settings loaded": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
-    "com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
-    "database.data.extractors.current.export.id": "Comma-separated (CSV)_id",
-    "database.data.extractors.current.id": "Comma-separated (CSV)_id",
-    "git-widget-placeholder": "feat/271-expedition-etape-1",
-    "junie.onboarding.icon.badge.shown": "true",
-    "last_opened_file_path": "//wsl.localhost/Ubuntu-24.04/home/matte/Ferme/frontend/services",
-    "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": "preferences.keymap",
-    "to.speed.mode.migration.done": "true",
-    "ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.MCP Project settings loaded&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
+    &quot;com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1&quot;: &quot;true&quot;,
+    &quot;database.data.extractors.current.export.id&quot;: &quot;Comma-separated (CSV)_id&quot;,
+    &quot;database.data.extractors.current.id&quot;: &quot;Comma-separated (CSV)_id&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;feat/271-expedition-etape-1&quot;,
+    &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;//wsl.localhost/Ubuntu-24.04/home/matte/Ferme/frontend/services&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot;,
+    &quot;to.speed.mode.migration.done&quot;: &quot;true&quot;,
+    &quot;ts.external.directory.path&quot;: &quot;/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "postgresql"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;postgresql&quot;
     ],
-    "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
-      "TEXT"
+    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
+      &quot;TEXT&quot;
     ],
-    "vue.recent.templates": [
-      "Vue Composition API Component"
+    &quot;vue.recent.templates&quot;: [
+      &quot;Vue Composition API Component&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\services" />
@@ -318,15 +307,9 @@
       <workItem from="1770125858721" duration="10606000" />
       <workItem from="1770188542722" duration="1032000" />
       <workItem from="1770189650316" duration="5784000" />
-      <workItem from="1770195538424" duration="16730000" />
-    </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>
+      <workItem from="1770195538424" duration="17019000" />
+      <workItem from="1770220986512" duration="1007000" />
+      <workItem from="1770274952830" duration="1124000" />
     </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" />
@@ -712,7 +695,15 @@
       <option name="project" value="LOCAL" />
       <updated>1770136475283</updated>
     </task>
-    <option name="localTasksCounter" value="51" />
+    <task id="LOCAL-00051" summary="feat : Expedition dev back-end WIP">
+      <option name="closed" value="true" />
+      <created>1770220736390</created>
+      <option name="number" value="00051" />
+      <option name="presentableId" value="LOCAL-00051" />
+      <option name="project" value="LOCAL" />
+      <updated>1770220736392</updated>
+    </task>
+    <option name="localTasksCounter" value="52" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -762,7 +753,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <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" />
@@ -787,14 +777,14 @@
     <MESSAGE value="feat : mise à jour du bon de réception" />
     <MESSAGE value="feat : mise à jour du bon de réception wip" />
     <MESSAGE value="feat : mise à jour du bon de réception WIP" />
-    <option name="LAST_COMMIT_MESSAGE" value="feat : mise à jour du bon de réception WIP" />
+    <MESSAGE value="feat : Expedition dev back-end WIP" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat : Expedition dev back-end WIP" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="javascript">
           <url>file://$PROJECT_DIR$/frontend/stores/reception.ts</url>
-          <properties lambdaOrdinal="-1" />
           <option name="timeStamp" value="2" />
         </line-breakpoint>
       </breakpoints>
-- 
2.39.5


From bffdc887013e981c617931b18ca9fb463a901519 Mon Sep 17 00:00:00 2001
From: kevin <kevin@yuno.malio.fr>
Date: Tue, 10 Feb 2026 16:16:05 +0100
Subject: [PATCH 07/12] feat : creer une nouvelle expedtion (WIP)

---
 .idea/workspace.xml                           | 209 ++++---
 .../components/shipment/shipment-form.vue     | 544 ++++++++++++++++++
 frontend/components/ui/UiNumberInput.vue      |   7 +-
 frontend/constants/steps.ts                   |   9 +-
 frontend/i18n/locales/fr.json                 |  11 +-
 frontend/pages/index.vue                      |   2 +-
 frontend/pages/shipment/[[id]].vue            |  88 +++
 frontend/services/bovin-shipment.ts           |  58 ++
 frontend/services/customer.ts                 |  23 +
 frontend/services/dto/bovin-shipment-data.ts  |   8 +
 frontend/services/dto/customer-data.ts        |   8 +
 frontend/services/dto/shipment-data.ts        |  51 ++
 frontend/services/dto/shipment-type-data.ts   |   5 +
 frontend/services/shipment-type.ts            |  24 +
 frontend/services/shipment.ts                 |  40 ++
 frontend/stores/shipment.ts                   |  58 ++
 src/Entity/Address.php                        |   2 +-
 src/Entity/BovinShipment.php                  |  54 +-
 src/Entity/Shipment.php                       |   7 +-
 19 files changed, 1083 insertions(+), 125 deletions(-)
 create mode 100644 frontend/components/shipment/shipment-form.vue
 create mode 100644 frontend/pages/shipment/[[id]].vue
 create mode 100644 frontend/services/bovin-shipment.ts
 create mode 100644 frontend/services/customer.ts
 create mode 100644 frontend/services/dto/bovin-shipment-data.ts
 create mode 100644 frontend/services/dto/customer-data.ts
 create mode 100644 frontend/services/dto/shipment-data.ts
 create mode 100644 frontend/services/dto/shipment-type-data.ts
 create mode 100644 frontend/services/shipment-type.ts
 create mode 100644 frontend/services/shipment.ts
 create mode 100644 frontend/stores/shipment.ts

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a3262d4..42ee722 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,28 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : panel scrollable plus interface revue">
+    <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" />
       <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/pages/admin/carrier/carrier-list.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/carrier/carrier-list.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -39,7 +56,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="feat/256-reception-etape-3-bovin" />
+        <entry key="$PROJECT_DIR$" value="fix/makefile" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -227,7 +244,7 @@
     "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
     "RunOnceActivity.git.unshallow": "true",
     "RunOnceActivity.typescript.service.memoryLimit.init": "true",
-    "git-widget-placeholder": "feat/312-creation-d-une-page-d-administration-listing-des-fournisseurs",
+    "git-widget-placeholder": "feat/271-expedition-etape-1",
     "last_opened_file_path": "/home/sroy/Documents/test/Ferme",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
@@ -252,11 +269,11 @@
 }]]></component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
-      <recent name="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\frontend\pages\admin\supplier" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\templates" />
       <recent name="C:\Users\autin\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches" />
       <recent name="C:\Users\autin\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches\Ferme_MCD\MCD_DOC" />
+      <recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\frontend\pages\reception" />
     </key>
   </component>
   <component name="SharedIndexes">
@@ -297,6 +314,78 @@
       <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>
@@ -617,79 +706,7 @@
       <option name="project" value="LOCAL" />
       <updated>1770217875423</updated>
     </task>
-    <task id="LOCAL-00050" summary="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
-      <option name="closed" value="true" />
-      <created>1770283622425</created>
-      <option name="number" value="00050" />
-      <option name="presentableId" value="LOCAL-00050" />
-      <option name="project" value="LOCAL" />
-      <updated>1770283622425</updated>
-    </task>
-    <task id="LOCAL-00051" summary="feat : ajout du responsive sur la navbar et la page d'accueil">
-      <option name="closed" value="true" />
-      <created>1770308927948</created>
-      <option name="number" value="00051" />
-      <option name="presentableId" value="LOCAL-00051" />
-      <option name="project" value="LOCAL" />
-      <updated>1770308927948</updated>
-    </task>
-    <task id="LOCAL-00052" summary="fix : logo centré en mod mobile">
-      <option name="closed" value="true" />
-      <created>1770310504254</created>
-      <option name="number" value="00052" />
-      <option name="presentableId" value="LOCAL-00052" />
-      <option name="project" value="LOCAL" />
-      <updated>1770310504254</updated>
-    </task>
-    <task id="LOCAL-00053" summary="feat : ajout d'un numéro de version automatique via la CI">
-      <option name="closed" value="true" />
-      <created>1770369945257</created>
-      <option name="number" value="00053" />
-      <option name="presentableId" value="LOCAL-00053" />
-      <option name="project" value="LOCAL" />
-      <updated>1770369945257</updated>
-    </task>
-    <task id="LOCAL-00054" summary="feat : update numéro de version">
-      <option name="closed" value="true" />
-      <created>1770370216428</created>
-      <option name="number" value="00054" />
-      <option name="presentableId" value="LOCAL-00054" />
-      <option name="project" value="LOCAL" />
-      <updated>1770370216428</updated>
-    </task>
-    <task id="LOCAL-00055" summary="fix : auto-tag-develop.yml">
-      <option name="closed" value="true" />
-      <created>1770370700697</created>
-      <option name="number" value="00055" />
-      <option name="presentableId" value="LOCAL-00055" />
-      <option name="project" value="LOCAL" />
-      <updated>1770370700698</updated>
-    </task>
-    <task id="LOCAL-00056" summary="fix : auto-tag-develop.yml">
-      <option name="closed" value="true" />
-      <created>1770370919043</created>
-      <option name="number" value="00056" />
-      <option name="presentableId" value="LOCAL-00056" />
-      <option name="project" value="LOCAL" />
-      <updated>1770370919043</updated>
-    </task>
-    <task id="LOCAL-00057" summary="feat : test auto-tag-develop.yml (auto incrément version)">
-      <option name="closed" value="true" />
-      <created>1770371073055</created>
-      <option name="number" value="00057" />
-      <option name="presentableId" value="LOCAL-00057" />
-      <option name="project" value="LOCAL" />
-      <updated>1770371073055</updated>
-    </task>
-    <task id="LOCAL-00058" summary="fix : nom page fournisseur">
-      <option name="closed" value="true" />
-      <created>1770632525875</created>
-      <option name="number" value="00058" />
-      <option name="presentableId" value="LOCAL-00058" />
-      <option name="project" value="LOCAL" />
-      <updated>1770632525875</updated>
-    </task>
-    <option name="localTasksCounter" value="59" />
+    <option name="localTasksCounter" value="50" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -739,6 +756,13 @@
     </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" />
@@ -757,14 +781,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)" />
-    <MESSAGE value="feat : ajout du responsive sur la navbar et la page d'accueil" />
-    <MESSAGE value="fix : logo centré en mod mobile" />
-    <MESSAGE value="feat : ajout d'un numéro de version automatique via la CI" />
-    <MESSAGE value="feat : update numéro de version" />
-    <MESSAGE value="fix : auto-tag-develop.yml" />
-    <MESSAGE value="feat : test auto-tag-develop.yml (auto incrément version)" />
-    <MESSAGE value="fix : nom page fournisseur" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix : nom page fournisseur" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="php">
+          <url>file://$PROJECT_DIR$/src/Entity/ReceptionPelletBuilding.php</url>
+          <line>6</line>
+          <option name="timeStamp" value="3" />
+        </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" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
@@ -778,4 +811,4 @@
       <option value=".github/prompts" />
     </promptFileLocations>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/frontend/components/shipment/shipment-form.vue b/frontend/components/shipment/shipment-form.vue
new file mode 100644
index 0000000..2e50dae
--- /dev/null
+++ b/frontend/components/shipment/shipment-form.vue
@@ -0,0 +1,544 @@
+<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">Éxpedition</h1>
+            <UiSelect
+                id="shipment-user"
+                label="Nom de l'utisateur"
+                :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 du jour"
+                wrapper-class="col-start-1 row-start-3"
+            />
+
+            <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>
+            </div>
+
+
+            <UiSelect
+                id="reception-driver"
+                v-model="form.customerId"
+                label="Client"
+                :options="customers.map((customer) => ({
+                    value: String(customer.id),
+                    label: customer.label
+                }))"
+                :loading="isLoadingCustomers"
+                wrapper-class="col-start-1 row-start-5"
+            />
+
+            <UiSelect
+                id="reception-driver"
+                v-model="form.addressId"
+                :options="customerAddresses.map((address) => ({
+                    value: String(address.id),
+                    label: address.fullAddress
+                }))"
+                :disabled="isLoadingCustomers || customerAddresses.length === 0"
+                label="Adresse"
+                wrapper-class="col-start-2 row-start-1"
+            />
+
+            <UiSelect
+                id="reception-driver"
+                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="reception-driver"
+                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"
+            />
+
+            <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"
+            />
+
+            <div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
+                <UiLicensePlateInput
+                    v-model="form.licencePlate"
+                    v-model:allowAny="allowAnyLicensePlate"
+                />
+            </div>
+            <!--    Immatriculation (LIOT)        -->
+            <UiSelect
+                v-if="isLiotCarrier"
+                id="reception-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-5"
+            />
+        </div>
+        <div class="flex justify-center">
+            <button
+                type="submit"
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
+            >Valider
+            </button>
+        </div>
+    </form>
+</template>
+<script setup lang="ts">
+
+import type {UserData} from '~/services/dto/user-data'
+import type {CustomerData} from '~/services/dto/customer-data'
+import type {TruckData} from '~/services/dto/truck-data'
+import type {CarrierData} from '~/services/dto/carrier-data'
+import type {DriverData} from '~/services/dto/driver-data'
+import type {VehicleData} from '~/services/dto/vehicle-data'
+import {getUsers} from '~/services/auth'
+import {getCustomerList} from '~/services/customer'
+import {getTruckList} from '~/services/truck'
+import {getCarrierList} from '~/services/carrier'
+import {getVehicleList} from '~/services/vehicle'
+import {getDriverList} from '~/services/driver'
+import type {ShipmentFormData} from '~/services/dto/shipment-data'
+import {SUPLLIER_CODE} from "~/utils/constants"
+import {useAuthStore} from '~/stores/auth'
+import {useShipmentStore} from '~/stores/shipment'
+import {ref} from "vue";
+import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
+import {getShipmentTypeList} from "~/services/shipment-type";
+import {
+    createShipmentBovine,
+    deleteShipmentBovine,
+    getBovinShipmentList,
+    updateShipmentBovine
+} from "~/services/bovin-shipment";
+
+const users = ref<UserData[]>([])
+const customers = ref<CustomerData[]>([])
+const trucks = ref<TruckData[]>([])
+const carriers = ref<CarrierData[]>([])
+const drivers = ref<DriverData[]>([])
+const vehicles = ref<VehicleData[]>([])
+
+const isLoadingUsers = ref(false)
+const isLoadingCustomers = ref(false)
+const isLoadingTrucks = ref(false)
+const isLoadingCarriers = ref(false)
+const isHydrating = ref(false)
+const isLoadingVehicles = ref(false)
+const allowAnyLicensePlate = ref(false)
+const isLoadingDrivers = ref(false)
+const authStore = useAuthStore()
+const shipmentStore = useShipmentStore()
+const router = useRouter()
+const bovineQuantities = ref<Record<string, number | null>>({})
+const bovineShipment = ref<ShipmentTypeData[]>([])
+// Transporteur sélectionné dans le formulaire
+const selectedCarrier = computed(() =>
+    carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
+)
+const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPLLIER_CODE.LIOT)
+
+
+const form = reactive<ShipmentFormData>({
+    userId: '',
+    shipmentDate: new Date().toISOString().slice(0, 10),
+    customerId: '',
+    addressId: '',
+    truckId: '',
+    carrierId: '',
+    driverId: '',
+    vehicleId: '',
+    licencePlate: '',
+})
+
+const customerAddresses = computed(() => {
+    const customerId = Number(form.customerId)
+    if (!Number.isFinite(customerId)) {
+        return []
+    }
+    return customers.value.find((customer) => customer.id === customerId)?.addresses ?? []
+})
+
+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 () => {
+    isLoadingUsers.value = true
+    try {
+        bovineShipment.value = await getShipmentTypeList()
+    } finally {
+        isLoadingUsers.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
+    }
+}
+
+
+// On met le user connecté par défaut dans le select
+const setDefaultUser = () => {
+    if (form.userId) {
+        return
+    }
+    if (authStore.user?.id) {
+        form.userId = String(authStore.user.id)
+    }
+}
+
+onMounted(async () => {
+    await loadShipmentType()
+    await loadUsers()
+    await loadCustomers()
+    await loadTrucks()
+    await loadCarriers()
+    await loadVehicles()
+    await loadDrivers()
+    await authStore.ensureSession()
+    setDefaultUser()
+})
+
+watch(
+    () => shipmentStore.current,
+    (shipment) => {
+        if (!shipment || !shipment.bovinShipments) {
+            bovineQuantities.value = {}
+            return
+        }
+        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
+    },
+    {immediate: true}
+)
+
+// Ajuste driver/vehicle quand le transporteur change (logique LIOT)
+watch(
+    () => [form.customerId, 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) {
+            form.addressId = ''
+        }
+    },
+    {immediate: true}
+)
+
+// Valide/auto-sélectionne le véhicule selon camion + transporteur (LIOT)
+watch(
+    () => form.carrierId,
+    () => {
+        if (isHydrating.value) {
+            return
+        }
+        if (!form.carrierId) {
+            form.driverId = ''
+            form.vehicleId = ''
+            return
+        }
+        if (!isLiotCarrier.value) {
+            form.driverId = ''
+            form.vehicleId = ''
+            return
+        }
+        if (filteredDrivers.value.length === 1) {
+            form.driverId = String(filteredDrivers.value[0].id)
+        }
+        if (filteredVehicles.value.length === 1) {
+            form.vehicleId = String(filteredVehicles.value[0].id)
+        }
+    },
+    {immediate: true}
+)
+
+// Récupère la plaque depuis le véhicule choisi (LIOT)
+watch(
+    () => [form.truckId, form.carrierId, vehicles.value],
+    () => {
+        if (!isLiotCarrier.value) {
+            return
+        }
+        if (filteredVehicles.value.length === 1) {
+            form.vehicleId = String(filteredVehicles.value[0].id)
+            return
+        }
+        if (!form.vehicleId) {
+            return
+        }
+        const matches = filteredVehicles.value.some(
+            (vehicle) => String(vehicle.id) === form.vehicleId
+        )
+        if (!matches) {
+            form.vehicleId = ''
+        }
+    },
+    {immediate: true}
+)
+
+// Auto-renseigne le véhicule si la plaque correspond (LIOT)
+watch(
+    () => [form.vehicleId, form.carrierId, vehicles.value],
+    () => {
+        if (!isLiotCarrier.value) {
+            return
+        }
+        if (isHydrating.value) {
+            return
+        }
+        const selected = filteredVehicles.value.find(
+            (vehicle) => String(vehicle.id) === form.vehicleId
+        )
+        if (selected) {
+            form.licencePlate = selected.plate
+            allowAnyLicensePlate.value = false
+        }
+    }
+)
+
+watch(
+    () => [form.licencePlate, form.carrierId, vehicles.value],
+    () => {
+        if (!isLiotCarrier.value || form.vehicleId) {
+            return
+        }
+        const match = filteredVehicles.value.find(
+            (vehicle) => vehicle.plate === form.licencePlate
+        )
+        if (match) {
+            form.vehicleId = String(match.id)
+        }
+    }
+)
+
+const buildDesiredBovinShipments = () => {
+    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) => {
+    const shipmentIri = `/api/shipments/${shipmentId}`
+    const existing = await getBovinShipmentList(shipmentIri)
+    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) {
+        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
+        })
+    }
+}
+
+// Valide le formulaire et crée/met à jour l'expédition
+const validate = async () => {
+    const normalizedLicensePlate = form.licencePlate.trim()
+    const normalizedShipmentDate = form.shipmentDate.trim()
+    const normalizedCustomerId = form.customerId.trim()
+    const normalizedTruckId = form.truckId.trim()
+    const normalizedCarrierId = form.carrierId.trim()
+
+    const customerIri = normalizedCustomerId
+        ? `/api/customers/${normalizedCustomerId}`
+        : null
+    const truckIri = normalizedTruckId
+        ? `/api/trucks/${normalizedTruckId}`
+        : null
+    const carrierIri = normalizedCarrierId
+        ? `/api/carriers/${normalizedCarrierId}`
+        : null
+
+    const payload = {
+        licencePlate: normalizedLicensePlate,
+        shipmentDate: normalizedShipmentDate,
+        customer: customerIri,
+        truck: truckIri,
+        carrier: carrierIri
+    }
+    if (!shipmentStore.current) {
+        const created = await shipmentStore.createShipment({
+            currentStep: 1,
+            ...payload
+        })
+        if (created) {
+            await syncBovinShipments(created.id)
+            await router.push(`/shipment/${created.id}`)
+        }
+        return
+    }
+
+    const nextStep = shipmentStore.current.currentStep + 1
+    await shipmentStore.updateShipment(shipmentStore.current.id, {
+        currentStep: nextStep,
+        ...payload
+    })
+    await syncBovinShipments(shipmentStore.current.id)
+}
+</script>
diff --git a/frontend/components/ui/UiNumberInput.vue b/frontend/components/ui/UiNumberInput.vue
index aa5407f..3ebc130 100644
--- a/frontend/components/ui/UiNumberInput.vue
+++ b/frontend/components/ui/UiNumberInput.vue
@@ -3,7 +3,7 @@
         <label
             v-if="label"
             :for="id"
-            class="text-xl text-bold flex items-center gap-2"
+            class="text-xl text-bold flex items-center"
             :class="labelClass"
         >
             <span
@@ -11,7 +11,8 @@
                 {{ label }}
             </span>
             <span
-                v-if="code" class="text-neutral-600">
+                v-if="code"
+                class="text-neutral-600">
                 ({{ code }})
             </span>
         </label>
@@ -24,7 +25,7 @@
             :step="step"
             :disabled="disabled"
             v-bind="attrs"
-            class="border-b border-black text-xl bg-transparent w-48"
+            class="border-b border-black text-xl bg-transparent w-12"
             :class="[
                 isEmpty ? 'text-neutral-400' : 'text-black',
                 disabled ? 'cursor-not-allowed' : 'cursor-text',
diff --git a/frontend/constants/steps.ts b/frontend/constants/steps.ts
index 2e51937..d42ae66 100644
--- a/frontend/constants/steps.ts
+++ b/frontend/constants/steps.ts
@@ -2,7 +2,8 @@ export enum StepLabel {
     Reception = 'Réception',
     GrossWeighing = 'Pesée à plein',
     Selection = 'Sélection réceptionnées',
-    TareWeighing = 'Pesée à vide'
+    TareWeighing = 'Pesée à vide',
+    Shipment = 'Expédition',
 }
 
 export const RECEPTION_STEP_LABELS = [
@@ -11,3 +12,9 @@ export const RECEPTION_STEP_LABELS = [
     StepLabel.Selection,
     StepLabel.TareWeighing
 ]
+
+export const SHIPMENT_STEP_LABELS = [
+    StepLabel.Shipment,
+    StepLabel.TareWeighing,
+    StepLabel.GrossWeighing,
+]
diff --git a/frontend/i18n/locales/fr.json b/frontend/i18n/locales/fr.json
index 4ea1b99..6b7acba 100644
--- a/frontend/i18n/locales/fr.json
+++ b/frontend/i18n/locales/fr.json
@@ -14,6 +14,13 @@
             "update": "Impossible de mettre à jour la réception.",
             "weigh": "Impossible de récupérer la pesée."
         },
+        "shipment": {
+            "list": "Impossible de récupérer la liste des éxpeditions.",
+            "fetch": "Impossible de récupérer l'éxpeditions.",
+            "create": "Impossible de créer l'éxpeditions.",
+            "update": "Impossible de mettre à jour l'éxpeditions.",
+            "weigh": "Impossible de récupérer la pesée."
+        },
         "receptionType": {
             "list": "Impossible de récupérer la liste des types de réception."
         },
@@ -50,7 +57,6 @@
             "fetch": "Impossible de récupérer les données du transporteur",
             "update": "Impossible de mettre à jour le transporteur",
             "create": "Impossible de créer le transporteur"
-
         },
         "driver": {
             "list": "Impossible de récupérer la liste des chauffeurs."
@@ -70,6 +76,9 @@
         "reception": {
             "update": "Réception mise à jour avec succès."
         },
+        "shipment": {
+            "update": "Éxpedition mise à jour avec succès."
+        },
         "auth": {
             "update": "Utilisateur mis à jour avec succès.",
             "create": "Utilisateur créé avec succès.",
diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue
index b7e90a4..52d3da7 100644
--- a/frontend/pages/index.vue
+++ b/frontend/pages/index.vue
@@ -3,7 +3,7 @@
 <template>
     <div class="flex flex-wrap justify-center mt-8 gap-8 mb-8 md:mb-0">
         <card-link label="NOUVELLE RÉCEPTION" link="/reception" iconName="mdi:truck-outline" />
-        <card-link label="NOUVELLE EXPÉDITION" link="/" iconName="mdi:truck-fast-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="/" iconName="mdi:truck-cargo-container" />
diff --git a/frontend/pages/shipment/[[id]].vue b/frontend/pages/shipment/[[id]].vue
new file mode 100644
index 0000000..e4a1ef2
--- /dev/null
+++ b/frontend/pages/shipment/[[id]].vue
@@ -0,0 +1,88 @@
+<template>
+    <div>
+        <div class="flex justify-between h-[52px] mb-[80px]">
+            <div class="flex flex-1 mr-16">
+                <UiStepper
+                    :labels="SHIPMENT_STEP_LABELS"
+                    :current-step="storeShipment?.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>
+        <ShipmentForm v-if="!storeShipment || storeShipment.currentStep === 0"/>
+        <button
+            v-if="storeShipment?.currentStep === 1">
+            TEST ETAPE 2
+        </button>
+    </div>
+</template>
+<script setup lang="ts">
+
+import {SHIPMENT_STEP_LABELS} from "~/constants/steps";
+import {storeToRefs} from "pinia";
+import {useShipmentStore} from "~/stores/shipment";
+
+const shipmentStore = useShipmentStore()
+const {current: storeShipment} = storeToRefs(shipmentStore)
+
+const route = useRoute()
+const router = useRouter()
+
+const resolveShipmentId = (param: unknown) => {
+    const idStr = Array.isArray(param) ? param[0] : param
+    if (!idStr) {
+        return null
+    }
+    const id = Number(idStr)
+    return Number.isFinite(id) ? id : null
+}
+
+watch (
+    () => route.params.id,
+    async (param) => {
+        const id = resolveShipmentId(param)
+        if (id === null) {
+            shipmentStore.clearCurrent()
+            return
+        }
+        await shipmentStore.loadShipment(id)
+    },
+    {immediate: true}
+)
+
+const saveAndHold = async () => {
+    if (!shipmentStore.current) {
+        await router.push('/')
+        return
+    }
+    await shipmentStore.updateShipment(shipmentStore.current.id, {
+        currentStep: shipmentStore.current.currentStep,
+        licencePlate: shipmentStore.current.licencePlate,
+        shipmentDate: shipmentStore.current.shipmentDate
+    })
+    await router.push('/')
+}
+const handleStepSelect = async (step: number) => {
+    if (!shipmentStore.current) {
+        return
+    }
+
+    if (step === shipmentStore.current.currentStep) {
+        return
+    }
+
+    await shipmentStore.updateShipment(shipmentStore.current.id, {
+        currentStep: step
+    })
+    await shipmentStore.loadShipment(shipmentStore.current.id)
+}
+
+
+</script>
diff --git a/frontend/services/bovin-shipment.ts b/frontend/services/bovin-shipment.ts
new file mode 100644
index 0000000..45871dc
--- /dev/null
+++ b/frontend/services/bovin-shipment.ts
@@ -0,0 +1,58 @@
+import { useApi } from '~/composables/useApi'
+import type { BovinShipmentData } from '~/services/dto/bovin-shipment-data'
+export type BovinShipmentListResponse =
+    | BovinShipmentData[]
+    | { 'hydra:member'?: BovinShipmentData[] }
+
+export type ShipmentBovinePayload = {
+    nbBovinSend: number
+    shipment: string
+    shipmentType: string
+}
+
+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'
+    })
+}
diff --git a/frontend/services/customer.ts b/frontend/services/customer.ts
new file mode 100644
index 0000000..04c8faa
--- /dev/null
+++ b/frontend/services/customer.ts
@@ -0,0 +1,23 @@
+import { useApi } from '~/composables/useApi'
+import type { CustomerData } from '~/services/dto/customer-data'
+
+export type CustomerListResponse =
+    | CustomerData[]
+    | { 'hydra:member'?: CustomerData[] }
+
+export async function getCustomerList(): Promise<CustomerData[]> {
+    const api = useApi()
+    const response = await api.get<CustomerListResponse>('customers', {}, {
+        toastErrorKey: 'errors.customer.list'
+    })
+
+    if (Array.isArray(response)) {
+        return response
+    }
+
+    if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
+        return response['hydra:member']
+    }
+
+    return []
+}
diff --git a/frontend/services/dto/bovin-shipment-data.ts b/frontend/services/dto/bovin-shipment-data.ts
new file mode 100644
index 0000000..e3bdd42
--- /dev/null
+++ b/frontend/services/dto/bovin-shipment-data.ts
@@ -0,0 +1,8 @@
+import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
+
+export interface BovinShipmentData {
+    id: number
+    nbBovinSend: number | null
+    shipment?: string | null
+    shipmentType?: ShipmentTypeData | null
+}
diff --git a/frontend/services/dto/customer-data.ts b/frontend/services/dto/customer-data.ts
new file mode 100644
index 0000000..57d6f7d
--- /dev/null
+++ b/frontend/services/dto/customer-data.ts
@@ -0,0 +1,8 @@
+import type { AddressData } from "~/services/dto/address-data"
+
+export interface CustomerData {
+    id: number
+    label: string
+    code?: string | null
+    addresses?: AddressData[] | null
+}
diff --git a/frontend/services/dto/shipment-data.ts b/frontend/services/dto/shipment-data.ts
new file mode 100644
index 0000000..40ec748
--- /dev/null
+++ b/frontend/services/dto/shipment-data.ts
@@ -0,0 +1,51 @@
+import type {CarrierData} from '~/services/dto/carrier-data'
+import type {TruckData} from '~/services/dto/truck-data'
+import type {CustomerData} from '~/services/dto/customer-data'
+
+export interface ShipmentTypeData {
+    id: number
+    label: string
+    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
+    shipmentDate: string
+    currentStep: number
+    isValid: boolean
+    carrier?: CarrierData | null
+    truck?: TruckData | null
+    customer?: CustomerData | null
+    bovinShipments?: BovinShipmentData[] | null
+}
+
+export type ShipmentFormData = {
+    userId: string,
+    shipmentDate: string,
+    customerId: string,
+    addressId: string,
+    truckId: string,
+    carrierId: string,
+    driverId: string,
+    vehicleId: string,
+    licencePlate: string,
+}
+
+export type ShipmentPayload = {
+    licencePlate?: string | null
+    shipmentDate?: string
+    currentStep?: number
+    isValid?: boolean
+    carrier?: string | null
+    truck?: string | null
+    customer?: string | null
+    bovinShipments?: string[] | null
+}
diff --git a/frontend/services/dto/shipment-type-data.ts b/frontend/services/dto/shipment-type-data.ts
new file mode 100644
index 0000000..e1c66db
--- /dev/null
+++ b/frontend/services/dto/shipment-type-data.ts
@@ -0,0 +1,5 @@
+export interface ShipmentTypeData {
+    id: number
+    label: string
+    code: string
+}
diff --git a/frontend/services/shipment-type.ts b/frontend/services/shipment-type.ts
new file mode 100644
index 0000000..a1f8315
--- /dev/null
+++ b/frontend/services/shipment-type.ts
@@ -0,0 +1,24 @@
+import { useApi } from '~/composables/useApi'
+import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
+
+export type ShipmentTypeListResponse =
+    | ShipmentTypeData[]
+    | { 'hydra:member'?: ShipmentTypeData[] }
+
+
+export async function getShipmentTypeList(): Promise<ShipmentTypeData[]> {
+    const api = useApi()
+    const response = await api.get<ShipmentTypeListResponse>('shipment_types', {}, {
+        toastErrorKey: 'errors.shipment_type.list'
+    })
+
+    if (Array.isArray(response)) {
+        return response
+    }
+
+    if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
+        return response['hydra:member']
+    }
+
+    return []
+}
diff --git a/frontend/services/shipment.ts b/frontend/services/shipment.ts
new file mode 100644
index 0000000..0eecc68
--- /dev/null
+++ b/frontend/services/shipment.ts
@@ -0,0 +1,40 @@
+import {useApi} from '~/composables/useApi'
+import type {ShipmentData, ShipmentPayload} from '~/services/dto/shipment-data'
+import type {WeightData} from '~/services/dto/weight-data'
+
+export async function getShipmentList(isValid: boolean|null = null) {
+    const api = useApi()
+    const query = isValid !== null ? { isValid: isValid} : {}
+    return api.get<ShipmentData[]>('shipments', query, {
+        toastErrorKey: 'errors.shipment.list'
+    })
+}
+
+export async function getShipment(id: number) {
+    const api = useApi()
+    return api.get<ShipmentData>(`shipments/${id}`, {}, {
+        toastErrorKey: 'errors.shipment.fetch'
+    })
+}
+
+export async function createShipment(payload: ShipmentPayload = {}) {
+    const api = useApi()
+    return api.post<ShipmentData>('shipments', payload, {
+        toastErrorKey: 'errors.shipment.create'
+    })
+}
+
+export async function updateShipment(id: number, payload: ShipmentPayload) {
+    const api = useApi()
+    return api.patch<ShipmentData>(`shipments/${id}`, payload, {
+        toastErrorKey: 'errors.shipment.update',
+        toastSuccessKey: 'success.shipment.update'
+    })
+}
+
+export async function getWeight(): Promise<WeightData> {
+    const api = useApi()
+    return api.get<WeightData>('shipments/weigh', {}, {
+        toastErrorKey: 'errors.shipment.weigh'
+    })
+}
diff --git a/frontend/stores/shipment.ts b/frontend/stores/shipment.ts
new file mode 100644
index 0000000..a92b919
--- /dev/null
+++ b/frontend/stores/shipment.ts
@@ -0,0 +1,58 @@
+import { defineStore } from 'pinia'
+import type {ShipmentData, ShipmentPayload} from "~/services/dto/shipment-data";
+import {createShipment, getShipment, updateShipment} from "~/services/shipment";
+
+const isShipmentData = (value: unknown): value is ShipmentData => {
+    return Boolean(value && typeof value === 'object' && 'id' in value)
+}
+export const useShipmentStore = defineStore('shipment', {
+    state: () => ({
+        current: null as ShipmentData | null,
+        isLoading: false
+    }),
+    actions: {
+        setCurrent(shipment: ShipmentData | null) {
+            this.current = shipment
+        },
+        clearCurrent() {
+            this.current = null
+        },
+        async loadShipment(id: number) {
+            this.isLoading = true
+            const result = await getShipment(id).finally(() => {
+                this.isLoading = false
+            })
+            if (!isShipmentData(result)) {
+                this.current = null
+                return null
+            }
+
+            this.current = result
+            return result
+        },
+        async createShipment(payload: ShipmentPayload = {}) {
+            this.isLoading = true
+            const result = await createShipment(payload).finally(() => {
+                this.isLoading = false
+            })
+            if (!isShipmentData(result)) {
+                return null
+            }
+
+            this.current = result
+            return result
+        },
+        async updateShipment(id: number, payload: ShipmentPayload) {
+            this.isLoading = true
+            const result = await updateShipment(id, payload).finally(() => {
+                this.isLoading = false
+            })
+            if (!isShipmentData(result)) {
+                return null
+            }
+
+            this.current = result
+            return result
+        }
+    }
+})
diff --git a/src/Entity/Address.php b/src/Entity/Address.php
index e51450c..f8afe1d 100644
--- a/src/Entity/Address.php
+++ b/src/Entity/Address.php
@@ -146,7 +146,7 @@ class Address
         return $this;
     }
 
-    #[Groups(['address:read', 'supplier:read', 'reception:read'])]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read'])]
     public function getFullAddress(): string
     {
         $parts = array_filter([
diff --git a/src/Entity/BovinShipment.php b/src/Entity/BovinShipment.php
index e538215..6a7bf4e 100644
--- a/src/Entity/BovinShipment.php
+++ b/src/Entity/BovinShipment.php
@@ -4,64 +4,64 @@ 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' => ['bovin-shipment:read']],
+            normalizationContext: ['groups' => ['shipment-bovine:read']],
         ),
         new GetCollection(
-            normalizationContext: ['groups' => ['bovin-shipment:read']],
+            normalizationContext: ['groups' => ['shipment-bovine:read']],
         ),
 
-        //        new Get(
-        //            uriTemplate: '/receptions/weigh',
-        //            openapi: new OpenApiOperation(
-        //                summary: 'Fetch the current weight reading',
-        //                description: 'Queries the pont-bascule and returns the weight data.',
-        //            ),
-        //            normalizationContext: ['groups' => ['reception:weigh:read']],
-        //            output: PontBasculeReading::class,
-        //            provider: ReceptionWeighingProvider::class,
-        //        ),
-        //        new Get(
-        //            uriTemplate: '/receptions/{id}/receipt',
-        //            requirements: ['id' => '\d+'],
-        //            openapi: new OpenApiOperation(
-        //                summary: 'Render a reception receipt',
-        //                description: 'Returns a PDF receipt for the reception.',
-        //            ),
-        //            output: false,
-        //            provider: ReceptionReceiptProvider::class,
-        //        ),
+        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', 'bovine-shipment:read'])]
+    #[Groups(['shipment:read', 'shipment-bovine:read'])]
     private ?int $id = null;
 
-    #[ORM\ManyToOne(inversedBy: 'shipment_types')]
-    #[Groups(['bovine-shipment:read'])]
+    #[ORM\ManyToOne(inversedBy: 'bovinShipments')]
+    #[Groups(['shipment-bovine:read', 'shipment-bovine:write'])]
+    #[ApiProperty(readableLink: true)]
     private ?Shipment $shipment = null;
 
     #[ORM\ManyToOne]
-    #[Groups(['shipment:read', 'bovine-shipment:read'])]
+    #[Groups(['shipment:read', 'shipment-bovine:write', 'shipment-bovine:read'])]
+    #[ApiProperty(readableLink: true)]
     private ?ShipmentType $shipmentType = null;
 
     #[ORM\Column]
-    #[Groups(['shipment:read', 'bovine-shipment:read'])]
+    #[Groups(['shipment:read', 'shipment-bovine:write', 'shipment-bovine:read'])]
     private ?int $nbBovinSend = null;
 
     public function getId(): ?int
diff --git a/src/Entity/Shipment.php b/src/Entity/Shipment.php
index 24f41a5..90d5d2f 100644
--- a/src/Entity/Shipment.php
+++ b/src/Entity/Shipment.php
@@ -11,6 +11,7 @@ use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\Patch;
 use ApiPlatform\Metadata\Post;
 use DateTimeImmutable;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Context;
@@ -81,7 +82,7 @@ class Shipment
 
     #[ORM\Column]
     #[Groups(['shipment:read', 'shipment:write'])]
-    private ?bool $isValid = null;
+    private bool $isValid = false;
 
     #[ORM\Column(name: 'shipment_date', type: 'datetime_immutable')]
     #[Groups(['shipment:read', 'shipment:write'])]
@@ -111,9 +112,9 @@ class Shipment
     #[Groups(['shipment:read', 'shipment:write'])]
     private Collection $bovinShipments;
 
-    public function __construct(Collection $bovinShipments)
+    public function __construct()
     {
-        $this->bovinShipments = $bovinShipments;
+        $this->bovinShipments = new ArrayCollection();
     }
 
     public function getId(): ?int
-- 
2.39.5


From 5f4139fde33e16dee69129250b24101d2da0b0c5 Mon Sep 17 00:00:00 2001
From: kevin <kevin@yuno.malio.fr>
Date: Wed, 11 Feb 2026 16:12:33 +0100
Subject: [PATCH 08/12] feat : ajout d'une page de creation d'une expedition

---
 CHANGELOG.md                                  |   3 +
 .../components/reception/reception-form.vue   |   4 +-
 .../components/reception/reception-weight.vue |   4 +-
 .../components/shipment/shipment-form.vue     | 237 ++++++++------
 .../components/shipment/shipment-weight.vue   | 101 ++++++
 frontend/components/user/user-form.vue        | 123 --------
 frontend/composables/usePdfPrinter.ts         |  30 +-
 frontend/composables/useWeighing.ts           |  93 ++++++
 frontend/i18n/locales/fr.json                 |   9 +
 frontend/pages/admin/dashboard.vue            |   2 -
 frontend/pages/admin/user/[[id]].vue          | 119 ++++++-
 frontend/pages/reception/update/[[id]].vue    |   4 +-
 frontend/pages/shipment/[[id]].vue            |  22 +-
 frontend/services/dto/shipment-data.ts        |  14 +
 frontend/services/shipment-type.ts            |   2 +-
 frontend/services/shipment.ts                 |   2 +-
 frontend/services/weight.ts                   |   3 +-
 frontend/utils/constants.ts                   |   2 +-
 migrations/Version20260211075656.php          |  49 +++
 migrations/Version20260211123000.php          |  38 +++
 src/Dto/PontBasculeReading.php                |   6 +-
 src/Entity/Address.php                        |  41 ++-
 src/Entity/Driver.php                         |   4 +-
 src/Entity/Shipment.php                       | 199 +++++++++---
 src/Entity/Truck.php                          |   4 +-
 src/Entity/User.php                           |   4 +-
 src/Entity/Weight.php                         |  38 ++-
 src/State/ShipmentReceiptProvider.php         |  63 ++++
 src/State/ShipmentWeighingProvider.php        |  30 ++
 templates/reception_voucher.html.twig         | 106 ++++---
 templates/shipment_voucher.html.twig          | 292 ++++++++++++++++++
 31 files changed, 1292 insertions(+), 356 deletions(-)
 create mode 100644 frontend/components/shipment/shipment-weight.vue
 delete mode 100644 frontend/components/user/user-form.vue
 create mode 100644 migrations/Version20260211075656.php
 create mode 100644 migrations/Version20260211123000.php
 create mode 100644 src/State/ShipmentReceiptProvider.php
 create mode 100644 src/State/ShipmentWeighingProvider.php
 create mode 100644 templates/shipment_voucher.html.twig

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 308b37e..816a8d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,9 @@ Ajouter dans le fichier .env du frontend
 * [#315] Creation page admin utilisateur
 * [#317] Admin modification creation transporteur
 * [#318] Affichage modification reception terminée
+* [#271] Créer une nouvelle expédition (étape 1)
+* [#256] Créer une nouvelle réception (étape 3 - bovin)
+* [#314] Création d'une page d'administration : listing des utilisateurs
 
 ### Changed
 
diff --git a/frontend/components/reception/reception-form.vue b/frontend/components/reception/reception-form.vue
index 063a363..93d2daf 100644
--- a/frontend/components/reception/reception-form.vue
+++ b/frontend/components/reception/reception-form.vue
@@ -142,7 +142,7 @@ import type {DriverData} from '~/services/dto/driver-data'
 import {getDriverList} from '~/services/driver'
 import type {VehicleData} from '~/services/dto/vehicle-data'
 import {getVehicleList} from '~/services/vehicle'
-import {RECEPTION_TYPE_CODES, SUPLLIER_CODE} from "~/utils/constants";
+import {RECEPTION_TYPE_CODES, SUPPLIER_CODE} from "~/utils/constants";
 import {deleteReceptionBovine, getReceptionBovineList} from "~/services/reception-bovine";
 import type {ReceptionFormData} from "~/services/dto/reception-data";
 
@@ -183,7 +183,7 @@ const selectedCarrier = computed(() =>
     carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
 )
 // Indique si le transporteur est LIOT
-const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPLLIER_CODE.LIOT)
+const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
 // Adresses disponibles pour le fournisseur sélectionné
 const supplierAddresses = computed(() => {
     const supplierId = Number(form.supplierId)
diff --git a/frontend/components/reception/reception-weight.vue b/frontend/components/reception/reception-weight.vue
index 7e624d7..5547810 100644
--- a/frontend/components/reception/reception-weight.vue
+++ b/frontend/components/reception/reception-weight.vue
@@ -74,7 +74,9 @@ const printReceipt = async () => {
     }
 
     await saveWeight()
-    await printPdf(`/receptions/${receptionStore.current.id}/receipt`)
+    const reception = receptionStore.current
+    const filename = `${reception.identificationNumber ?? reception.id}_${reception.supplier?.name ?? 'fournisseur'}_${reception.licensePlate ?? 'immat'}.pdf`
+    await printPdf(`/receptions/${reception.id}/receipt`, filename)
 
     // Laisse le temps a la boite de dialogue d'impression de s'ouvrir.
     await new Promise((resolve) => setTimeout(resolve, 600))
diff --git a/frontend/components/shipment/shipment-form.vue b/frontend/components/shipment/shipment-form.vue
index 2e50dae..1eb026a 100644
--- a/frontend/components/shipment/shipment-form.vue
+++ b/frontend/components/shipment/shipment-form.vue
@@ -1,10 +1,12 @@
 <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">Éxpedition</h1>
+            <h1 class="font-bold text-5xl uppercase col-start-1 row-start-1">Expédition</h1>
+            <!--    Nom de l'utilisateur       -->
             <UiSelect
                 id="shipment-user"
-                label="Nom de l'utisateur"
+                v-model="form.userId"
+                label="Nom de l'utilisateur"
                 :options="users.map((user) => ({
                     value: String(user.id),
                     label: user.username
@@ -12,14 +14,14 @@
                 :loading="isLoadingUsers"
                 wrapper-class="col-start-1 row-start-2"
             />
-
+            <!--    Date de l'éxpedition        -->
             <UiDateInput
                 id="shipment-date"
                 v-model="form.shipmentDate"
                 label="Date du jour"
                 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
@@ -40,10 +42,9 @@
                     </div>
                 </div>
             </div>
-
-
+            <!--    Client        -->
             <UiSelect
-                id="reception-driver"
+                id="shipment-customer"
                 v-model="form.customerId"
                 label="Client"
                 :options="customers.map((customer) => ({
@@ -53,21 +54,18 @@
                 :loading="isLoadingCustomers"
                 wrapper-class="col-start-1 row-start-5"
             />
-
+            <!--    Adresse du client        -->
             <UiSelect
-                id="reception-driver"
+                id="shipment-address"
                 v-model="form.addressId"
-                :options="customerAddresses.map((address) => ({
-                    value: String(address.id),
-                    label: address.fullAddress
-                }))"
+                :options="customerAddressOptions"
                 :disabled="isLoadingCustomers || customerAddresses.length === 0"
                 label="Adresse"
                 wrapper-class="col-start-2 row-start-1"
             />
-
+            <!--   Camion        -->
             <UiSelect
-                id="reception-driver"
+                id="shipment-truck"
                 v-model="form.truckId"
                 label="Camion"
                 :options="trucks.map((truck) => ({
@@ -77,9 +75,9 @@
                 :loading="isLoadingTrucks"
                 wrapper-class="col-start-2 row-start-2"
             />
-
+            <!--   Transporteur        -->
             <UiSelect
-                id="reception-driver"
+                id="shipment-carrier"
                 v-model="form.carrierId"
                 label="Transporteur"
                 :options="carriers.map((carrier) => ({
@@ -88,9 +86,9 @@
                 }))"
                 wrapper-class="col-start-2 row-start-3"
             />
-
+            <!--  Chauffeur (LIOT)        -->
             <UiSelect
-                id="reception-driver"
+                id="shipment-driver"
                 v-model="form.driverId"
                 label="Nom du chauffeur si LIOT"
                 :options="filteredDrivers.map((driver) => ({
@@ -100,7 +98,7 @@
                 :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">
                 <UiLicensePlateInput
                     v-model="form.licencePlate"
@@ -110,7 +108,7 @@
             <!--    Immatriculation (LIOT)        -->
             <UiSelect
                 v-if="isLiotCarrier"
-                id="reception-vehicle"
+                id="shipment-vehicle"
                 v-model="form.vehicleId"
                 label="Immatriculation"
                 :options="filteredVehicles.map((vehicle) => ({
@@ -139,6 +137,7 @@ import type {TruckData} from '~/services/dto/truck-data'
 import type {CarrierData} from '~/services/dto/carrier-data'
 import type {DriverData} from '~/services/dto/driver-data'
 import type {VehicleData} from '~/services/dto/vehicle-data'
+import type {AddressData} from '~/services/dto/address-data'
 import {getUsers} from '~/services/auth'
 import {getCustomerList} from '~/services/customer'
 import {getTruckList} from '~/services/truck'
@@ -146,10 +145,10 @@ import {getCarrierList} from '~/services/carrier'
 import {getVehicleList} from '~/services/vehicle'
 import {getDriverList} from '~/services/driver'
 import type {ShipmentFormData} from '~/services/dto/shipment-data'
-import {SUPLLIER_CODE} from "~/utils/constants"
+import {SUPPLIER_CODE} from "~/utils/constants"
 import {useAuthStore} from '~/stores/auth'
 import {useShipmentStore} from '~/stores/shipment'
-import {ref} 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 {
@@ -167,6 +166,7 @@ const drivers = ref<DriverData[]>([])
 const vehicles = ref<VehicleData[]>([])
 
 const isLoadingUsers = ref(false)
+const isLoadingShipmentTypes = ref(false)
 const isLoadingCustomers = ref(false)
 const isLoadingTrucks = ref(false)
 const isLoadingCarriers = ref(false)
@@ -183,8 +183,7 @@ const bovineShipment = ref<ShipmentTypeData[]>([])
 const selectedCarrier = computed(() =>
     carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
 )
-const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPLLIER_CODE.LIOT)
-
+const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
 
 const form = reactive<ShipmentFormData>({
     userId: '',
@@ -197,22 +196,30 @@ const form = reactive<ShipmentFormData>({
     vehicleId: '',
     licencePlate: '',
 })
-
-const customerAddresses = computed(() => {
+// Adresses liées au client sélectionné
+const customerAddresses = computed<AddressData[]>(() => {
     const customerId = Number(form.customerId)
     if (!Number.isFinite(customerId)) {
         return []
     }
     return customers.value.find((customer) => customer.id === customerId)?.addresses ?? []
 })
-
+// Options pour le select des adresses du client
+const customerAddressOptions = computed(() =>
+    customerAddresses.value
+        .map((address) => ({
+            value: String(address.id),
+            label: address.fullAddress
+        }))
+)
+// Chauffeurs liés au transporteur sélectionné (LIOT)
 const filteredDrivers = computed<DriverData[]>(() => {
     if (!form.carrierId) {
         return []
     }
     return drivers.value.filter((driver) => String(driver.carrier?.id) === form.carrierId)
 })
-
+// Véhicules liés au transporteur + camion sélectionnés (LIOT)
 const filteredVehicles = computed<VehicleData[]>(() => {
     if (!form.carrierId) {
         return []
@@ -223,8 +230,7 @@ const filteredVehicles = computed<VehicleData[]>(() => {
             (!form.truckId || String(vehicle.truck?.id) === form.truckId)
     )
 })
-
-
+// Chargement des données pour les selects
 const loadUsers = async () => {
     isLoadingUsers.value = true
     try {
@@ -235,11 +241,11 @@ const loadUsers = async () => {
 }
 
 const loadShipmentType = async () => {
-    isLoadingUsers.value = true
+    isLoadingShipmentTypes.value = true
     try {
         bovineShipment.value = await getShipmentTypeList()
     } finally {
-        isLoadingUsers.value = false
+        isLoadingShipmentTypes.value = false
     }
 }
 
@@ -252,7 +258,6 @@ const loadCustomers = async () => {
     }
 
 }
-
 const loadTrucks = async () => {
     isLoadingTrucks.value = true
     try {
@@ -261,7 +266,6 @@ const loadTrucks = async () => {
         isLoadingTrucks.value = false
     }
 }
-
 const loadCarriers = async () => {
     isLoadingCarriers.value = true
     try {
@@ -270,7 +274,6 @@ const loadCarriers = async () => {
         isLoadingCarriers.value = false
     }
 }
-
 const loadVehicles = async () => {
     isLoadingVehicles.value = true
     try {
@@ -279,7 +282,6 @@ const loadVehicles = async () => {
         isLoadingVehicles.value = false
     }
 }
-
 const loadDrivers = async () => {
     isLoadingDrivers.value = true
     try {
@@ -288,8 +290,6 @@ const loadDrivers = async () => {
         isLoadingDrivers.value = false
     }
 }
-
-
 // On met le user connecté par défaut dans le select
 const setDefaultUser = () => {
     if (form.userId) {
@@ -299,7 +299,7 @@ const setDefaultUser = () => {
         form.userId = String(authStore.user.id)
     }
 }
-
+// Chargement initial des données
 onMounted(async () => {
     await loadShipmentType()
     await loadUsers()
@@ -311,27 +311,37 @@ onMounted(async () => {
     await authStore.ensureSession()
     setDefaultUser()
 })
-
+// Hydrate le formulaire depuis l'expédition en cours
 watch(
     () => shipmentStore.current,
     (shipment) => {
+        isHydrating.value = true
+        form.licencePlate = shipment?.licencePlate ?? ''
+        form.shipmentDate = shipment?.shipmentDate ?? new Date().toISOString().slice(0, 10)
+        form.userId = shipment?.user?.id ? String(shipment.user.id) :
+            form.userId
+        form.customerId = shipment?.customer?.id ?
+            String(shipment.customer.id) : ''
+        form.addressId = shipment?.address?.id ? String(shipment.address.id) : ''
+        form.truckId = shipment?.truck?.id ? String(shipment.truck.id) : ''
+        form.carrierId = shipment?.carrier?.id ? String(shipment.carrier.id) : ''
+        form.driverId = shipment?.driver?.id ? String(shipment.driver.id) : ''
+        form.vehicleId = shipment?.vehicle?.id ? String(shipment.vehicle.id) : ''
         if (!shipment || !shipment.bovinShipments) {
             bovineQuantities.value = {}
-            return
-        }
-        const next: Record<string, number | null> = {}
-        for (const entry of shipment.bovinShipments) {
-            const typeId = entry.shipmentType?.id
-            if (!typeId) {
-                continue
+        } 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
             }
-            next[String(typeId)] = entry.nbBovinSend ?? null
+            bovineQuantities.value = next
         }
-        bovineQuantities.value = next
+        isHydrating.value = false
     },
     {immediate: true}
 )
-
 // Ajuste driver/vehicle quand le transporteur change (logique LIOT)
 watch(
     () => [form.customerId, customers.value],
@@ -356,34 +366,43 @@ watch(
     },
     {immediate: true}
 )
-
 // Valide/auto-sélectionne le véhicule selon camion + transporteur (LIOT)
+const applyLiotDefaults = () => {
+    if (isHydrating.value) {
+        return
+    }
+    if (!form.carrierId) {
+        form.driverId = ''
+        form.vehicleId = ''
+        return
+    }
+    if (!isLiotCarrier.value) {
+        form.driverId = ''
+        form.vehicleId = ''
+        return
+    }
+    if (filteredDrivers.value.length === 1) {
+        form.driverId = String(filteredDrivers.value[0].id)
+    }
+    if (filteredVehicles.value.length === 1) {
+        form.vehicleId = String(filteredVehicles.value[0].id)
+    }
+}
 watch(
     () => form.carrierId,
     () => {
-        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)
-        }
+        applyLiotDefaults()
     },
     {immediate: true}
 )
-
+watch(
+    () => isHydrating.value,
+    (value) => {
+        if (!value) {
+            applyLiotDefaults()
+        }
+    }
+)
 // Récupère la plaque depuis le véhicule choisi (LIOT)
 watch(
     () => [form.truckId, form.carrierId, vehicles.value],
@@ -407,7 +426,6 @@ watch(
     },
     {immediate: true}
 )
-
 // Auto-renseigne le véhicule si la plaque correspond (LIOT)
 watch(
     () => [form.vehicleId, form.carrierId, vehicles.value],
@@ -427,7 +445,6 @@ watch(
         }
     }
 )
-
 watch(
     () => [form.licencePlate, form.carrierId, vehicles.value],
     () => {
@@ -442,7 +459,6 @@ watch(
         }
     }
 )
-
 const buildDesiredBovinShipments = () => {
     return bovineShipment.value
         .map((type) => {
@@ -455,17 +471,20 @@ const buildDesiredBovinShipments = () => {
         })
         .filter((entry) => entry.quantity > 0)
 }
-
-const syncBovinShipments = async (shipmentId: number) => {
+const syncBovinShipments = async (
+    shipmentId: number,
+    existing: Array<{ id?: number; nbBovinSend: number | null; shipmentType?: unknown }> = []
+) => {
     const shipmentIri = `/api/shipments/${shipmentId}`
-    const existing = await getBovinShipmentList(shipmentIri)
     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) {
@@ -496,15 +515,15 @@ const syncBovinShipments = async (shipmentId: number) => {
         })
     }
 }
-
-// Valide le formulaire et crée/met à jour l'expédition
-const validate = async () => {
+const buildPayload = () => {
     const normalizedLicensePlate = form.licencePlate.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 customerIri = normalizedCustomerId
         ? `/api/customers/${normalizedCustomerId}`
         : null
@@ -514,31 +533,73 @@ const validate = async () => {
     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 payload = {
+    return {
         licencePlate: normalizedLicensePlate,
         shipmentDate: normalizedShipmentDate,
         customer: customerIri,
         truck: truckIri,
-        carrier: carrierIri
+        carrier: carrierIri,
+        driver: driverIri,
+        user: userIri,
+        address: addressIri
     }
+}
+
+const saveDraft = async () => {
+    const payload = buildPayload()
+    if (!shipmentStore.current) {
+        const created = await shipmentStore.createShipment({
+            currentStep: 0,
+            ...payload
+        })
+        if (created) {
+            await syncBovinShipments(created.id, [])
+        }
+        return
+    }
+
+    await shipmentStore.updateShipment(shipmentStore.current.id, {
+        currentStep: shipmentStore.current.currentStep,
+        ...payload
+    })
+    await syncBovinShipments(
+        shipmentStore.current.id,
+        shipmentStore.current?.bovinShipments ?? []
+    )
+}
+
+defineExpose({saveDraft})
+// Valide le formulaire et crée/met à jour l'expédition
+const validate = async () => {
+    const payload = buildPayload()
     if (!shipmentStore.current) {
         const created = await shipmentStore.createShipment({
             currentStep: 1,
             ...payload
         })
         if (created) {
-            await syncBovinShipments(created.id)
+            await shipmentStore.loadShipment(created.id)
+            await syncBovinShipments(created.id, shipmentStore.current?.bovinShipments ?? [])
             await router.push(`/shipment/${created.id}`)
         }
         return
     }
-
     const nextStep = shipmentStore.current.currentStep + 1
     await shipmentStore.updateShipment(shipmentStore.current.id, {
         currentStep: nextStep,
         ...payload
     })
-    await syncBovinShipments(shipmentStore.current.id)
+    await shipmentStore.loadShipment(shipmentStore.current.id)
+    await syncBovinShipments(shipmentStore.current.id, shipmentStore.current?.bovinShipments ?? [])
 }
 </script>
diff --git a/frontend/components/shipment/shipment-weight.vue b/frontend/components/shipment/shipment-weight.vue
new file mode 100644
index 0000000..07bcf47
--- /dev/null
+++ b/frontend/components/shipment/shipment-weight.vue
@@ -0,0 +1,101 @@
+<template>
+    <div class="flex justify-center">
+        <div class="flex flex-col items-center w-[660px]">
+            <h1 class="font-bold text-5xl uppercase">{{ title }}</h1>
+<!--@TODO Voir comment faire pour savoir si le pont-bascule et bien connecté + ajouter un icon comme sur la maquette-->
+            <p class="text-primary-500 uppercase text-2xl mt-2">Pont-bascule connecté</p>
+            <div
+                v-if="showLoadingBox"
+                class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[86px]">
+                    <UiLoadingDots />
+            </div>
+            <div v-else-if="displayWeight !== null" class="w-full">
+                <div
+                    class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl">
+                    {{ displayWeight }} kg
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="flex justify-center mt-[54px]">
+        <button
+            class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            @click="fetchWeight"
+        >{{ displayWeight !== null ? 'refaire une pesee' : 'peser' }}</button>
+        <button
+            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
+            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>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted } from 'vue'
+import { storeToRefs } from 'pinia'
+import { useWeighingShipment } from '~/composables/useWeighing'
+import { usePdfPrinter } from '~/composables/usePdfPrinter'
+import { useShipmentStore } from '~/stores/shipment'
+
+const props = defineProps<{
+    mode: 'gross' | 'tare'
+}>()
+
+const router = useRouter()
+const shipmentStore = useShipmentStore()
+const { current: storeShipment } = storeToRefs(shipmentStore)
+const { printPdf } = usePdfPrinter()
+const {
+    displayWeight,
+    title,
+    showLoadingBox,
+    fetchWeight,
+    saveWeight
+} = useWeighingShipment({
+    modeShipment: props.mode,
+    shipment: storeShipment,
+    updateShipment: shipmentStore.updateShipment,
+    loadShipment: shipmentStore.loadShipment
+})
+// Affiche le bouton de génération du bon à l'étape tare
+const showGenerateReceipt = computed(
+    () => props.mode === 'tare' && displayWeight.value !== null
+)
+
+// Génère le bon d'expédition, puis clôture l'expédition
+const printReceipt = async () => {
+    if (!import.meta.client || !shipmentStore.current) {
+        return
+    }
+
+    await saveWeight()
+    const shipment = shipmentStore.current
+    const filename = `${shipment.identificationNumber ?? shipment.id}_${shipment.customer?.label ?? 'client'}_${shipment.licencePlate ?? 'immat'}.pdf`
+    await printPdf(`/shipments/${shipment.id}/receipt`, filename)
+
+    // Laisse le temps a la boite de dialogue d'impression de s'ouvrir.
+    await new Promise((resolve) => setTimeout(resolve, 600))
+
+    const result = await shipmentStore.updateShipment(shipmentStore.current.id, {
+        isValid: true
+    })
+    if (!result) {
+        return
+    }
+
+/*    shipmentStore.clearCurrent()
+    await router.push('/')*/
+}
+
+// Récupère le poids dès l'arrivée sur l'écran
+onMounted(() => {
+    if (displayWeight.value === null) {
+        fetchWeight()
+    }
+})
+</script>
diff --git a/frontend/components/user/user-form.vue b/frontend/components/user/user-form.vue
deleted file mode 100644
index 137d299..0000000
--- a/frontend/components/user/user-form.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-    <form @submit.prevent="validate">
-        <div
-            class="flex items-center justify-between gap-10">
-            <h1 class="text-3xl font-bold uppercase">
-                {{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
-            </h1>
-            <button
-                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
-                type="submit"
-            >
-                {{ userId ? 'Sauvegarder' : 'Ajouter' }}
-            </button>
-        </div>
-
-        <div class="grid gap-y-16 gap-x-40 mb-16">
-            <UiTextInput
-                id="user-name"
-                v-model="form.username"
-                label="Nom de l'utilisateur"
-            />
-
-            <UiSelect
-                id="user-role"
-                v-model="form.role"
-                label="Rôle de l'utilisateur"
-                :options="ROLE"
-            />
-            <UiTextInput
-                id="user-password"
-                v-model="form.password"
-                label="Mot de passe"
-                type="password"
-
-            />
-
-        </div>
-    </form>
-</template>
-
-<script setup lang="ts">
-
-import {computed, reactive, ref, watch} from 'vue'
-import {ROLE} from '~/utils/constants'
-import {createUser, updateUser, getUser} from '~/services/auth'
-import type {UserData, UserFormData} from '~/services/dto/user-data'
-
-const route = useRoute()
-const router = useRouter()
-const userId = computed(() => resolveUserId(route.params.id))
-const isLoading = ref(false)
-const isHydrating = ref(false)
-
-const resolveUserId = (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<UserFormData>({
-    username: '',
-    password: '',
-    role: ''
-})
-
-const hydrateFromUser = (user: UserData | null) => {
-    if (!user) {
-        return
-    }
-    isHydrating.value = true
-    form.username = user.username ?? ''
-    const roles = user.roles ?? []
-    const hasAdmin = roles.includes("ROLE_ADMIN")
-    form.role = hasAdmin ? "ROLE_ADMIN" : "ROLE_USER"
-    form.password = ''
-    isHydrating.value = false
-}
-
-watch(
-    () => userId.value,
-    async (id) => {
-        if (id === null) {
-            return
-        }
-        isLoading.value = true
-        try {
-            const user = await getUser(id)
-            hydrateFromUser(user)
-        } finally {
-            isLoading.value = false
-        }
-    },
-    {immediate: true}
-)
-
-async function validate() {
-
-    const normalizedUsername = form.username.trim()
-    const normalizedRole = form.role.trim()
-    const normalizedPassword = form.password.trim()
-
-    const basePayload = {
-        username: normalizedUsername,
-        roles: normalizedRole ? [normalizedRole] : undefined,
-        password: normalizedPassword || undefined
-    }
-
-    if (userId.value) {
-        await updateUser(userId.value, basePayload)
-        await router.push(`/admin/user/list/`)
-        return
-    }
-
-    const created = await createUser(basePayload)
-    if (created) {
-        await router.push(`/admin/user/list/`)
-    }
-}
-</script>
diff --git a/frontend/composables/usePdfPrinter.ts b/frontend/composables/usePdfPrinter.ts
index ff6a057..3e34846 100644
--- a/frontend/composables/usePdfPrinter.ts
+++ b/frontend/composables/usePdfPrinter.ts
@@ -1,30 +1,26 @@
-import {useApi} from '~/composables/useApi'
+import { useApi } from '~/composables/useApi'
 
 export const usePdfPrinter = () => {
     const api = useApi()
-    const receptionStore = useReceptionStore()
-    const currentReception = receptionStore.current
 
-    const printPdf = async (url: string): Promise<void> => {
-        const blob = await api.getBlob(url);
+    const printPdf = async (url: string, filename = 'document.pdf'): Promise<void> => {
+        const blob = await api.getBlob(url)
 
         const pdfBlob = blob.type === 'application/pdf'
             ? blob
-            : new Blob([blob], { type: 'application/pdf' });
+            : new Blob([blob], { type: 'application/pdf' })
 
-        const blobUrl = URL.createObjectURL(pdfBlob);
+        const blobUrl = URL.createObjectURL(pdfBlob)
 
-        const filename = `${currentReception.identificationNumber}_${currentReception.supplier.name}_${currentReception.licensePlate}.pdf`;
-
-        const a = document.createElement('a');
-        a.href = blobUrl;
-        a.download = filename;
-        a.style.display = 'none';
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
+        const a = document.createElement('a')
+        a.href = blobUrl
+        a.download = filename
+        a.style.display = 'none'
+        document.body.appendChild(a)
+        a.click()
+        a.remove()
         // L'ouverture dans un nouvel onglet déclenche un 2e PDF sans le nom personnalisé.
-        setTimeout(() => URL.revokeObjectURL(blobUrl), 60_000);
+        setTimeout(() => URL.revokeObjectURL(blobUrl), 60_000)
     }
 
     return {
diff --git a/frontend/composables/useWeighing.ts b/frontend/composables/useWeighing.ts
index 9aea037..25adbea 100644
--- a/frontend/composables/useWeighing.ts
+++ b/frontend/composables/useWeighing.ts
@@ -1,8 +1,10 @@
 import type {Ref} from 'vue'
 import {computed, ref} from 'vue'
 import type {ReceptionData, ReceptionPayload, WeightEntryData} from '~/services/dto/reception-data'
+import type {ShipmentData, ShipmentPayload, WeightShipmentEntryData } from '~/services/dto/shipment-data'
 import type {WeightData} from '~/services/dto/weight-data'
 import {getWeight} from '~/services/reception'
+import {getWeightShipment} from '~/services/shipment'
 import {createWeight, updateWeight} from '~/services/weight'
 
 export type WeighingMode = 'gross' | 'tare'
@@ -14,6 +16,13 @@ type UseWeighingOptions = {
     loadReception?: (id: number) => Promise<ReceptionData | null>
 }
 
+type UseWeighingShipmentOptions = {
+    modeShipment: WeighingMode
+    shipment: Ref<ShipmentData | null>
+    updateShipment: (id: number, payload: ShipmentPayload) => Promise<ShipmentData | null>
+    loadShipment?: (id: number) => Promise<ShipmentData | null>
+}
+
 export const useWeighing = ({
     mode,
     reception,
@@ -97,3 +106,87 @@ export const useWeighing = ({
         saveWeight
     }
 }
+
+export const useWeighingShipment = ({
+                                modeShipment,
+                                shipment,
+                                updateShipment,
+                                loadShipment
+                            }: UseWeighingShipmentOptions) => {
+    const weightData = ref<WeightData | null>(null)
+    const isFetching = ref(false)
+
+    const currentWeightEntry = computed<WeightShipmentEntryData | null>(() => {
+        const weights = shipment.value?.weights ?? []
+        return weights.find((entry) => entry.type === modeShipment) ?? null
+    })
+
+    const displayWeight = computed(() => weightData.value?.weight ?? currentWeightEntry.value?.weight ?? null)
+    const displayDsd = computed(() => weightData.value?.dsd ?? currentWeightEntry.value?.dsd ?? '-')
+    const title = computed(() => (modeShipment === 'gross' ? 'Pesée à plein' : 'Pesée à vide'))
+    const showLoadingBox = computed(
+        () => isFetching.value || (displayWeight.value === null && currentWeightEntry.value === null)
+    )
+
+    const fetchWeight = async () => {
+        isFetching.value = true
+        weightData.value = await getWeightShipment().finally(() => {
+            isFetching.value = false
+        })
+    }
+
+    const saveWeight = async () => {
+        if (!shipment.value) {
+            return
+        }
+
+        const existingEntry = currentWeightEntry.value
+        const baseDsd = weightData.value?.dsd ?? existingEntry?.dsd ?? null
+        const baseWeight = weightData.value?.weight ?? existingEntry?.weight ?? null
+        const baseWeighedAt = weightData.value?.weighedAt ?? existingEntry?.weighedAt ?? null
+
+        if (baseWeight === null) {
+            return
+        }
+
+        if (existingEntry?.id) {
+            await updateWeight(existingEntry.id, {
+                type: modeShipment,
+                dsd: baseDsd,
+                weight: baseWeight,
+                weighedAt: baseWeighedAt
+            })
+        } else {
+            await createWeight({
+                shipment: `api/shipments/${shipment.value.id}`,
+                type: modeShipment,
+                dsd: baseDsd,
+                weight: baseWeight,
+                weighedAt: baseWeighedAt
+            })
+        }
+
+        const nextStep = modeShipment === 'tare'
+            ? shipment.value.currentStep
+            : shipment.value.currentStep + 1
+        await updateShipment(shipment.value.id, {
+            currentStep: nextStep,
+            isValid: shipment.value.isValid
+        })
+
+        if (loadShipment) {
+            await loadShipment(shipment.value.id)
+        }
+    }
+
+    return {
+        weightData,
+        currentWeightEntry,
+        displayWeight,
+        displayDsd,
+        title,
+        showLoadingBox,
+        fetchWeight,
+        saveWeight
+    }
+}
diff --git a/frontend/i18n/locales/fr.json b/frontend/i18n/locales/fr.json
index 6b7acba..4ce3287 100644
--- a/frontend/i18n/locales/fr.json
+++ b/frontend/i18n/locales/fr.json
@@ -21,6 +21,15 @@
             "update": "Impossible de mettre à jour l'éxpeditions.",
             "weigh": "Impossible de récupérer la pesée."
         },
+        "shipmentBovine": {
+            "list": "Impossible de récupérer la liste des bovins de l'éxpedition.",
+            "create": "Impossible d'enregistrer le bovin.",
+            "delete": "Impossible de supprimer le bovin.",
+            "update": "Impossible de mettre à jour le bovin."
+        },
+        "shipmentType": {
+            "list": "Impossible de récupérer la liste des types d'éxpedition."
+        },
         "receptionType": {
             "list": "Impossible de récupérer la liste des types de réception."
         },
diff --git a/frontend/pages/admin/dashboard.vue b/frontend/pages/admin/dashboard.vue
index 788fdd1..28f3f30 100644
--- a/frontend/pages/admin/dashboard.vue
+++ b/frontend/pages/admin/dashboard.vue
@@ -1,7 +1,5 @@
 <template>
-    <AdminUserForm/>
 </template>
-
 <script setup lang="ts">
 definePageMeta({
     layout: 'admin'
diff --git a/frontend/pages/admin/user/[[id]].vue b/frontend/pages/admin/user/[[id]].vue
index e048f43..dd90c6c 100644
--- a/frontend/pages/admin/user/[[id]].vue
+++ b/frontend/pages/admin/user/[[id]].vue
@@ -1,8 +1,125 @@
 <template>
-    <UserForm/>
+    <form @submit.prevent="validate">
+        <div
+            class="flex items-center justify-between gap-10">
+            <h1 class="text-3xl font-bold uppercase">
+                {{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
+            </h1>
+            <button
+                class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+                type="submit"
+            >
+                {{ userId ? 'Sauvegarder' : 'Ajouter' }}
+            </button>
+        </div>
+
+        <div class="grid gap-y-16 gap-x-40 mb-16">
+            <UiTextInput
+                id="user-name"
+                v-model="form.username"
+                label="Nom de l'utilisateur"
+            />
+
+            <UiSelect
+                id="user-role"
+                v-model="form.role"
+                label="Rôle de l'utilisateur"
+                :options="ROLE"
+            />
+            <UiTextInput
+                id="user-password"
+                v-model="form.password"
+                label="Mot de passe"
+                type="password"
+
+            />
+
+        </div>
+    </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'
+
+const route = useRoute()
+const router = useRouter()
+const userId = computed(() => resolveUserId(route.params.id))
+const isLoading = ref(false)
+const isHydrating = ref(false)
+
+const resolveUserId = (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<UserFormData>({
+    username: '',
+    password: '',
+    role: ''
+})
+
+const hydrateFromUser = (user: UserData | null) => {
+    if (!user) {
+        return
+    }
+    isHydrating.value = true
+    form.username = user.username ?? ''
+    const roles = user.roles ?? []
+    const hasAdmin = roles.includes("ROLE_ADMIN")
+    form.role = hasAdmin ? "ROLE_ADMIN" : "ROLE_USER"
+    form.password = ''
+    isHydrating.value = false
+}
+
+watch(
+    () => userId.value,
+    async (id) => {
+        if (id === null) {
+            return
+        }
+        isLoading.value = true
+        try {
+            const user = await getUser(id)
+            hydrateFromUser(user)
+        } finally {
+            isLoading.value = false
+        }
+    },
+    {immediate: true}
+)
+
+async function validate() {
+
+    const normalizedUsername = form.username.trim()
+    const normalizedRole = form.role.trim()
+    const normalizedPassword = form.password.trim()
+
+    const basePayload = {
+        username: normalizedUsername,
+        roles: normalizedRole ? [normalizedRole] : undefined,
+        password: normalizedPassword || undefined
+    }
+
+    if (userId.value) {
+        await updateUser(userId.value, basePayload)
+        await router.push(`/admin/user/list/`)
+        return
+    }
+
+    const created = await createUser(basePayload)
+    if (created) {
+        await router.push(`/admin/user/list/`)
+    }
+}
 </script>
diff --git a/frontend/pages/reception/update/[[id]].vue b/frontend/pages/reception/update/[[id]].vue
index e5b28a7..b0a6cc6 100644
--- a/frontend/pages/reception/update/[[id]].vue
+++ b/frontend/pages/reception/update/[[id]].vue
@@ -137,7 +137,7 @@ import type {DriverData} from '~/services/dto/driver-data'
 import {getDriverList} from '~/services/driver'
 import type {VehicleData} from '~/services/dto/vehicle-data'
 import {getVehicleList} from '~/services/vehicle'
-import {SUPLLIER_CODE} from "~/utils/constants";
+import {SUPPLIER_CODE} from "~/utils/constants";
 import {deleteReceptionBovine, getReceptionBovineList} from "~/services/reception-bovine";
 import type {ReceptionData, ReceptionFormData} from "~/services/dto/reception-data";
 import {getReception} from "~/services/reception";
@@ -185,7 +185,7 @@ const selectedCarrier = computed(() =>
     carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
 )
 // Indique si le transporteur est LIOT
-const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPLLIER_CODE.LIOT)
+const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
 // Adresses disponibles pour le fournisseur sélectionné
 const supplierAddresses = computed(() => {
     const supplierId = Number(form.supplierId)
diff --git a/frontend/pages/shipment/[[id]].vue b/frontend/pages/shipment/[[id]].vue
index e4a1ef2..476e445 100644
--- a/frontend/pages/shipment/[[id]].vue
+++ b/frontend/pages/shipment/[[id]].vue
@@ -16,11 +16,10 @@
             >Mettre en attente
             </button>
         </div>
-        <ShipmentForm v-if="!storeShipment || storeShipment.currentStep === 0"/>
-        <button
-            v-if="storeShipment?.currentStep === 1">
-            TEST ETAPE 2
-        </button>
+        <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"/>
+
     </div>
 </template>
 <script setup lang="ts">
@@ -28,9 +27,10 @@
 import {SHIPMENT_STEP_LABELS} from "~/constants/steps";
 import {storeToRefs} from "pinia";
 import {useShipmentStore} from "~/stores/shipment";
-
+import { ref, watch } from 'vue'
 const shipmentStore = useShipmentStore()
 const {current: storeShipment} = storeToRefs(shipmentStore)
+const shipmentFormRef = ref<{ saveDraft: () => Promise<void> } | null>(null)
 
 const route = useRoute()
 const router = useRouter()
@@ -58,15 +58,9 @@ watch (
 )
 
 const saveAndHold = async () => {
-    if (!shipmentStore.current) {
-        await router.push('/')
-        return
+    if (shipmentFormRef.value) {
+        await shipmentFormRef.value.saveDraft()
     }
-    await shipmentStore.updateShipment(shipmentStore.current.id, {
-        currentStep: shipmentStore.current.currentStep,
-        licencePlate: shipmentStore.current.licencePlate,
-        shipmentDate: shipmentStore.current.shipmentDate
-    })
     await router.push('/')
 }
 const handleStepSelect = async (step: number) => {
diff --git a/frontend/services/dto/shipment-data.ts b/frontend/services/dto/shipment-data.ts
index 40ec748..a78016a 100644
--- a/frontend/services/dto/shipment-data.ts
+++ b/frontend/services/dto/shipment-data.ts
@@ -25,6 +25,16 @@ export type ShipmentData = {
     truck?: TruckData | null
     customer?: CustomerData | null
     bovinShipments?: BovinShipmentData[] | null
+    weights?: WeightShipmentEntryData[] | null
+
+}
+
+export interface WeightShipmentEntryData {
+    id?: number
+    type: 'gross' | 'tare'
+    dsd: number | null
+    weight: number | null
+    weighedAt: string | null
 }
 
 export type ShipmentFormData = {
@@ -48,4 +58,8 @@ export type ShipmentPayload = {
     truck?: string | null
     customer?: string | null
     bovinShipments?: string[] | null
+    address?: string | null
+    user?: string | null
+    driver?: string | null
+
 }
diff --git a/frontend/services/shipment-type.ts b/frontend/services/shipment-type.ts
index a1f8315..17cc328 100644
--- a/frontend/services/shipment-type.ts
+++ b/frontend/services/shipment-type.ts
@@ -9,7 +9,7 @@ export type ShipmentTypeListResponse =
 export async function getShipmentTypeList(): Promise<ShipmentTypeData[]> {
     const api = useApi()
     const response = await api.get<ShipmentTypeListResponse>('shipment_types', {}, {
-        toastErrorKey: 'errors.shipment_type.list'
+        toastErrorKey: 'errors.shipmentType.list'
     })
 
     if (Array.isArray(response)) {
diff --git a/frontend/services/shipment.ts b/frontend/services/shipment.ts
index 0eecc68..d701048 100644
--- a/frontend/services/shipment.ts
+++ b/frontend/services/shipment.ts
@@ -32,7 +32,7 @@ export async function updateShipment(id: number, payload: ShipmentPayload) {
     })
 }
 
-export async function getWeight(): Promise<WeightData> {
+export async function getWeightShipment(): Promise<WeightData> {
     const api = useApi()
     return api.get<WeightData>('shipments/weigh', {}, {
         toastErrorKey: 'errors.shipment.weigh'
diff --git a/frontend/services/weight.ts b/frontend/services/weight.ts
index b8ba1f7..72d0db0 100644
--- a/frontend/services/weight.ts
+++ b/frontend/services/weight.ts
@@ -2,7 +2,8 @@ import { useApi } from '~/composables/useApi'
 import type { WeightEntryData } from '~/services/dto/reception-data'
 
 export type WeightPayload = {
-    reception: string
+    reception?: string
+    shipment?: string
     type: 'gross' | 'tare'
     dsd: number | null
     weight: number | null
diff --git a/frontend/utils/constants.ts b/frontend/utils/constants.ts
index 719b4f6..2f741b8 100644
--- a/frontend/utils/constants.ts
+++ b/frontend/utils/constants.ts
@@ -12,6 +12,6 @@ export const ROLE = [
     { label: 'Administrateur', value: 'ROLE_ADMIN' },
     { label: 'Utilisateur', value: 'ROLE_USER' }
 ]
-export const SUPLLIER_CODE = {
+export const SUPPLIER_CODE = {
     LIOT: 'LIOT'
 }
diff --git a/migrations/Version20260211075656.php b/migrations/Version20260211075656.php
new file mode 100644
index 0000000..6bc612f
--- /dev/null
+++ b/migrations/Version20260211075656.php
@@ -0,0 +1,49 @@
+<?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 Version20260211075656 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 UNIQUE INDEX uniq_bovin_shipment ON bovin_shipment (shipment_id, shipment_type_id)');
+        $this->addSql('ALTER TABLE shipment ADD user_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE shipment ADD driver_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE shipment ADD address_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DCA76ED395 FOREIGN KEY (user_id) REFERENCES public."user" (id) NOT DEFERRABLE');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DCC3423909 FOREIGN KEY (driver_id) REFERENCES driver (id) NOT DEFERRABLE');
+        $this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DCF5B7AF75 FOREIGN KEY (address_id) REFERENCES address (id) NOT DEFERRABLE');
+        $this->addSql('CREATE INDEX IDX_2CB20DCA76ED395 ON shipment (user_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DCC3423909 ON shipment (driver_id)');
+        $this->addSql('CREATE INDEX IDX_2CB20DCF5B7AF75 ON shipment (address_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('DROP INDEX uniq_bovin_shipment');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DCA76ED395');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DCC3423909');
+        $this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DCF5B7AF75');
+        $this->addSql('DROP INDEX IDX_2CB20DCA76ED395');
+        $this->addSql('DROP INDEX IDX_2CB20DCC3423909');
+        $this->addSql('DROP INDEX IDX_2CB20DCF5B7AF75');
+        $this->addSql('ALTER TABLE shipment DROP user_id');
+        $this->addSql('ALTER TABLE shipment DROP driver_id');
+        $this->addSql('ALTER TABLE shipment DROP address_id');
+    }
+}
diff --git a/migrations/Version20260211123000.php b/migrations/Version20260211123000.php
new file mode 100644
index 0000000..32ba355
--- /dev/null
+++ b/migrations/Version20260211123000.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260211123000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Allow weight to belong to reception or shipment.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE weight ALTER COLUMN reception_id DROP NOT NULL');
+        $this->addSql('ALTER TABLE weight ADD shipment_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE weight ADD CONSTRAINT FK_WEIGHT_SHIPMENT FOREIGN KEY (shipment_id) REFERENCES shipment (id) NOT DEFERRABLE');
+        $this->addSql('CREATE INDEX IDX_WEIGHT_SHIPMENT ON weight (shipment_id)');
+        $this->addSql('CREATE UNIQUE INDEX uniq_weight_reception_type ON weight (reception_id, type)');
+        $this->addSql('CREATE UNIQUE INDEX uniq_weight_shipment_type ON weight (shipment_id, type)');
+        $this->addSql('ALTER TABLE weight ADD CONSTRAINT chk_weight_reception_or_shipment CHECK ((reception_id IS NOT NULL AND shipment_id IS NULL) OR (reception_id IS NULL AND shipment_id IS NOT NULL))');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE weight DROP CONSTRAINT chk_weight_reception_or_shipment');
+        $this->addSql('DROP INDEX uniq_weight_shipment_type');
+        $this->addSql('DROP INDEX uniq_weight_reception_type');
+        $this->addSql('DROP INDEX IDX_WEIGHT_SHIPMENT');
+        $this->addSql('ALTER TABLE weight DROP CONSTRAINT FK_WEIGHT_SHIPMENT');
+        $this->addSql('ALTER TABLE weight DROP shipment_id');
+        $this->addSql('ALTER TABLE weight ALTER COLUMN reception_id SET NOT NULL');
+    }
+}
diff --git a/src/Dto/PontBasculeReading.php b/src/Dto/PontBasculeReading.php
index 648c792..22c6c52 100644
--- a/src/Dto/PontBasculeReading.php
+++ b/src/Dto/PontBasculeReading.php
@@ -12,11 +12,11 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 final readonly class PontBasculeReading
 {
     public function __construct(
-        #[Groups(['reception:weigh:read'])]
+        #[Groups(['reception:weigh:read', 'shipment:weigh:read'])]
         private ?int $dsd,
-        #[Groups(['reception:weigh:read'])]
+        #[Groups(['reception:weigh:read', 'shipment:weigh:read'])]
         private ?float $weight,
-        #[Groups(['reception:weigh:read'])]
+        #[Groups(['reception:weigh:read', 'shipment:weigh:read'])]
         #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
         private ?DateTimeImmutable $weighedAt = null,
     ) {}
diff --git a/src/Entity/Address.php b/src/Entity/Address.php
index f8afe1d..8a13068 100644
--- a/src/Entity/Address.php
+++ b/src/Entity/Address.php
@@ -31,7 +31,7 @@ class Address
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column]
-    #[Groups(['address:read', 'supplier:read'])]
+    #[Groups(['address:read', 'supplier:read', 'customer:read', 'shipment:read'])]
     private ?int $id = null;
 
     #[ORM\Column(length: 120)]
@@ -64,9 +64,16 @@ class Address
     #[ORM\ManyToMany(targetEntity: Supplier::class, mappedBy: 'addresses')]
     private Collection $suppliers;
 
+    /**
+     * @var Collection<int, Shipment>
+     */
+    #[ORM\OneToMany(targetEntity: Shipment::class, mappedBy: 'address')]
+    private Collection $shipments;
+
     public function __construct()
     {
         $this->suppliers = new ArrayCollection();
+        $this->shipments = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -146,7 +153,7 @@ class Address
         return $this;
     }
 
-    #[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read'])]
+    #[Groups(['address:read', 'supplier:read', 'reception:read', 'shipment:read', 'customer:read'])]
     public function getFullAddress(): string
     {
         $parts = array_filter([
@@ -165,4 +172,34 @@ class Address
     {
         return $this->suppliers;
     }
+
+    /**
+     * @return Collection<int, Shipment>
+     */
+    public function getShipments(): Collection
+    {
+        return $this->shipments;
+    }
+
+    public function addShipment(Shipment $shipment): static
+    {
+        if (!$this->shipments->contains($shipment)) {
+            $this->shipments->add($shipment);
+            $shipment->setAddress($this);
+        }
+
+        return $this;
+    }
+
+    public function removeShipment(Shipment $shipment): static
+    {
+        if ($this->shipments->removeElement($shipment)) {
+            // set the owning side to null (unless already changed)
+            if ($shipment->getAddress() === $this) {
+                $shipment->setAddress(null);
+            }
+        }
+
+        return $this;
+    }
 }
diff --git a/src/Entity/Driver.php b/src/Entity/Driver.php
index 418ae08..5010b61 100644
--- a/src/Entity/Driver.php
+++ b/src/Entity/Driver.php
@@ -30,11 +30,11 @@ class Driver
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column]
-    #[Groups(['driver:read', 'reception:read'])]
+    #[Groups(['driver:read', 'reception:read', 'shipment:read'])]
     private ?int $id = null;
 
     #[ORM\Column(length: 180)]
-    #[Groups(['driver:read', 'reception:read'])]
+    #[Groups(['driver:read', 'reception:read', 'shipment:read'])]
     private string $name = '';
 
     #[ORM\ManyToOne]
diff --git a/src/Entity/Shipment.php b/src/Entity/Shipment.php
index 90d5d2f..8bcaed4 100644
--- a/src/Entity/Shipment.php
+++ b/src/Entity/Shipment.php
@@ -10,15 +10,21 @@ use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\Patch;
 use ApiPlatform\Metadata\Post;
+use ApiPlatform\OpenApi\Model\Operation as OpenApiOperation;
+use App\Dto\PontBasculeReading;
+use App\State\ShipmentReceiptProvider;
+use App\State\ShipmentWeighingProvider;
 use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Event\PostPersistEventArgs;
 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\HasLifecycleCallbacks]
 #[ORM\Table(name: 'shipment')]
 #[ApiResource(
     operations: [
@@ -38,27 +44,28 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
             normalizationContext: ['groups' => ['shipment:read']],
             denormalizationContext: ['groups' => ['shipment:write']],
         ),
-        //        new Get(
-        //            uriTemplate: '/shipments/weigh',
-        //            openapi: new OpenApiOperation(
-        //                summary: 'Fetch the current weight reading',
-        //                description: 'Queries the pont-bascule and returns the weight data.',
-        //            ),
-        //            normalizationContext: ['groups' => ['shipment:weigh:read']],
-        //            output: PontBasculeReading::class,
-        //            provider: shipmentWeighingProvider::class,
-        //        ),
-        //        new Get(
-        //            uriTemplate: '/shipments/{id}/receipt',
-        //            requirements: ['id' => '\d+'],
-        //            openapi: new OpenApiOperation(
-        //                summary: 'Render a shipment receipt',
-        //                description: 'Returns a PDF receipt for the shipment.',
-        //            ),
-        //            output: false,
-        //            provider: shipmentReceiptProvider::class,
-        //        ),
+        new Get(
+            uriTemplate: '/shipments/weigh',
+            openapi: new OpenApiOperation(
+                summary: 'Fetch the current weight reading',
+                description: 'Queries the pont-bascule and returns the weight data.',
+            ),
+            normalizationContext: ['groups' => ['shipment:weigh:read']],
+            output: PontBasculeReading::class,
+            provider: ShipmentWeighingProvider::class,
+        ),
+        new Get(
+            uriTemplate: '/shipments/{id}/receipt',
+            requirements: ['id' => '\d+'],
+            openapi: new OpenApiOperation(
+                summary: 'Render a shipment receipt',
+                description: 'Returns a PDF receipt for the shipment.',
+            ),
+            output: false,
+            provider: ShipmentReceiptProvider::class,
+        ),
     ],
+    security: "is_granted('ROLE_USER')",
 )]
 class Shipment
 {
@@ -84,6 +91,12 @@ class Shipment
     #[Groups(['shipment:read', 'shipment:write'])]
     private bool $isValid = false;
 
+    #[ORM\ManyToOne]
+    #[ORM\JoinColumn(nullable: true)]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    #[ApiProperty(readableLink: true)]
+    private ?User $user = null;
+
     #[ORM\Column(name: 'shipment_date', type: 'datetime_immutable')]
     #[Groups(['shipment:read', 'shipment:write'])]
     #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
@@ -102,19 +115,46 @@ class Shipment
     private ?Truck $truck = null;
 
     #[ORM\ManyToOne]
+    #[ORM\JoinColumn(nullable: true)]
     #[Groups(['shipment:read', 'shipment:write'])]
+    #[ApiProperty(readableLink: true)]
     private ?Customer $customer = null;
 
     /**
      * @var Collection<int, BovinShipment>
      */
-    #[ORM\OneToMany(targetEntity: BovinShipment::class, mappedBy: 'shipment')]
+    #[ORM\OneToMany(
+        targetEntity: BovinShipment::class,
+        mappedBy: 'shipment',
+        cascade: ['persist', 'remove'],
+        orphanRemoval: true
+    )]
     #[Groups(['shipment:read', 'shipment:write'])]
     private Collection $bovinShipments;
 
+    /**
+     * @var Collection<int, Weight>
+     */
+    #[ORM\OneToMany(targetEntity: Weight::class, mappedBy: 'shipment', cascade: ['persist', 'remove'], orphanRemoval: true)]
+    #[Groups(['shipment:read'])]
+    private Collection $weights;
+
+    #[ORM\ManyToOne]
+    #[ORM\JoinColumn(nullable: true)]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    #[ApiProperty(readableLink: true)]
+    private ?Driver $driver = null;
+
+    #[ORM\ManyToOne]
+    #[ORM\JoinColumn(nullable: true)]
+    #[Groups(['shipment:read', 'shipment:write'])]
+    #[ApiProperty(readableLink: true)]
+    private ?Address $address = null;
+
     public function __construct()
     {
         $this->bovinShipments = new ArrayCollection();
+        $this->weights        = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -157,6 +197,22 @@ class Shipment
         return $this->isValid;
     }
 
+    #[Groups(['shipment:read'])]
+    public function isValid(): bool
+    {
+        return $this->isValid;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setUser(?User $user): void
+    {
+        $this->user = $user;
+    }
+
     public function setIsValid(?bool $isValid): void
     {
         $this->isValid = $isValid;
@@ -182,16 +238,6 @@ class Shipment
         $this->carrier = $carrier;
     }
 
-    public function getVehicle(): ?Vehicle
-    {
-        return $this->vehicle;
-    }
-
-    public function setVehicle(?Vehicle $vehicle): void
-    {
-        $this->vehicle = $vehicle;
-    }
-
     public function getTruck(): ?Truck
     {
         return $this->truck;
@@ -222,24 +268,99 @@ class Shipment
         $this->bovinShipments = $bovinShipments;
     }
 
-    public function addPelletBuilding(BovinShipment $bovinShipments): self
+    public function addBovinShipment(BovinShipment $bovinShipment): self
     {
-        if (!$this->bovinShipments->contains($bovinShipments)) {
-            $this->bovinShipments->add($bovinShipments);
-            $bovinShipments->setReception($this);
+        if (!$this->bovinShipments->contains($bovinShipment)) {
+            $this->bovinShipments->add($bovinShipment);
+            $bovinShipment->setShipment($this);
         }
 
         return $this;
     }
 
-    public function removePelletBuilding(BovinShipment $bovinShipments): self
+    public function removeBovinShipment(BovinShipment $bovinShipment): self
     {
-        if ($this->bovinShipments->removeElement($bovinShipments)) {
-            if ($bovinShipments->getReception() === $this) {
-                $bovinShipments->setReception(null);
+        if ($this->bovinShipments->removeElement($bovinShipment)) {
+            if ($bovinShipment->getShipment() === $this) {
+                $bovinShipment->setShipment(null);
             }
         }
 
         return $this;
     }
+
+    /**
+     * @return Collection<int, Weight>
+     */
+    public function getWeights(): Collection
+    {
+        return $this->weights;
+    }
+
+    public function addWeight(Weight $weight): void
+    {
+        if (!$this->weights->contains($weight)) {
+            $this->weights->add($weight);
+            $weight->setShipment($this);
+        }
+    }
+
+    public function removeWeight(Weight $weight): void
+    {
+        if ($this->weights->removeElement($weight)) {
+            if ($weight->getShipment() === $this) {
+                $weight->setShipment(null);
+            }
+        }
+    }
+
+    #[ORM\PostPersist]
+    public function initializeIdentificationNumber(PostPersistEventArgs $args): void
+    {
+        if (null !== $this->identificationNumber) {
+            return;
+        }
+
+        if (null === $this->id) {
+            return;
+        }
+
+        $number                     = sprintf('P-BR-%04d', $this->id);
+        $this->identificationNumber = $number;
+
+        $args->getObjectManager()
+            ->getConnection()
+            ->executeStatement(
+                'UPDATE shipment SET identification_number = :number WHERE id = :id',
+                [
+                    'number' => $number,
+                    'id'     => $this->id,
+                ]
+            )
+        ;
+    }
+
+    public function getDriver(): ?Driver
+    {
+        return $this->driver;
+    }
+
+    public function setDriver(?Driver $driver): static
+    {
+        $this->driver = $driver;
+
+        return $this;
+    }
+
+    public function getAddress(): ?Address
+    {
+        return $this->address;
+    }
+
+    public function setAddress(?Address $address): static
+    {
+        $this->address = $address;
+
+        return $this;
+    }
 }
diff --git a/src/Entity/Truck.php b/src/Entity/Truck.php
index 2b89798..d8c3b42 100644
--- a/src/Entity/Truck.php
+++ b/src/Entity/Truck.php
@@ -29,11 +29,11 @@ class Truck
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column]
-    #[Groups(['truck:read', 'vehicle:read', 'reception:read'])]
+    #[Groups(['truck:read', 'vehicle:read', 'reception:read', 'shipment:read'])]
     private ?int $id = null;
 
     #[ORM\Column(length: 180)]
-    #[Groups(['truck:read', 'vehicle:read', 'reception:read'])]
+    #[Groups(['truck:read', 'vehicle:read', 'reception:read', 'shipment:read'])]
     private string $name = '';
 
     public function getId(): ?int
diff --git a/src/Entity/User.php b/src/Entity/User.php
index 13b672e..f45ccd6 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -61,11 +61,11 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column(type: 'integer')]
-    #[Groups(['user:read', 'user-login:read', 'reception:read'])]
+    #[Groups(['user:read', 'user-login:read', 'reception:read', 'shipment:read'])]
     private ?int $id = null;
 
     #[ORM\Column(length: 180, unique: true)]
-    #[Groups(['user:read', 'user:write', 'user-login:read', 'reception:read'])]
+    #[Groups(['user:read', 'user:write', 'user-login:read', 'reception:read', 'shipment:read'])]
     private string $username = '';
 
     #[ORM\Column(type: 'json')]
diff --git a/src/Entity/Weight.php b/src/Entity/Weight.php
index 0a695ff..3da8576 100644
--- a/src/Entity/Weight.php
+++ b/src/Entity/Weight.php
@@ -35,36 +35,46 @@ use Symfony\Component\Validator\Constraints as Assert;
     security: "is_granted('ROLE_USER')",
 )]
 #[UniqueEntity(fields: ['reception', 'type'], message: 'A weighing already exists for this type.')]
+#[UniqueEntity(fields: ['shipment', 'type'], message: 'A weighing already exists for this type.')]
+#[Assert\Expression(
+    '(this.getReception() !== null and this.getShipment() === null) or (this.getReception() === null and this.getShipment() !== null)',
+    message: 'Either reception or shipment must be set, but not both.'
+)]
 class Weight
 {
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column]
-    #[Groups(['reception:read', 'weight:read'])]
+    #[Groups(['reception:read', 'shipment:read', 'weight:read'])]
     private ?int $id = null;
 
     #[ORM\ManyToOne(inversedBy: 'weights')]
-    #[ORM\JoinColumn(nullable: false)]
+    #[ORM\JoinColumn(nullable: true)]
     #[Groups(['weight:read', 'weight:write'])]
     private ?Reception $reception = null;
 
+    #[ORM\ManyToOne(inversedBy: 'weights')]
+    #[ORM\JoinColumn(nullable: true)]
+    #[Groups(['weight:read', 'weight:write'])]
+    private ?Shipment $shipment = null;
+
     #[ORM\Column(nullable: true)]
-    #[Groups(['reception:read', 'weight:read', 'weight:write'])]
+    #[Groups(['reception:read', 'shipment:read', 'weight:read', 'weight:write'])]
     #[Assert\PositiveOrZero]
     private ?int $dsd = null;
 
     #[ORM\Column(nullable: true)]
-    #[Groups(['reception:read', 'weight:read', 'weight:write'])]
+    #[Groups(['reception:read', 'shipment:read', 'weight:read', 'weight:write'])]
     #[Assert\PositiveOrZero]
     private ?int $weight = null;
 
     #[ORM\Column(type: 'datetime_immutable', nullable: true)]
-    #[Groups(['reception:read', 'weight:read', 'weight:write'])]
+    #[Groups(['reception:read', 'shipment:read', 'weight:read', 'weight:write'])]
     #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
     private ?DateTimeImmutable $weighedAt = null;
 
     #[ORM\Column(length: 10)]
-    #[Groups(['reception:read', 'weight:read', 'weight:write'])]
+    #[Groups(['reception:read', 'shipment:read', 'weight:read', 'weight:write'])]
     #[Assert\NotBlank]
     #[Assert\Choice(choices: ['gross', 'tare'])]
     private string $type = 'gross';
@@ -90,6 +100,22 @@ class Weight
         return $this;
     }
 
+    public function getShipment(): ?Shipment
+    {
+        return $this->shipment;
+    }
+
+    public function setShipment(?Shipment $shipment): self
+    {
+        $this->shipment = $shipment;
+
+        if (null !== $shipment && !$shipment->getWeights()->contains($this)) {
+            $shipment->addWeight($this);
+        }
+
+        return $this;
+    }
+
     public function getDsd(): ?int
     {
         return $this->dsd;
diff --git a/src/State/ShipmentReceiptProvider.php b/src/State/ShipmentReceiptProvider.php
new file mode 100644
index 0000000..6dab4f5
--- /dev/null
+++ b/src/State/ShipmentReceiptProvider.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use App\Entity\Shipment;
+use Doctrine\ORM\EntityManagerInterface;
+use Dompdf\Dompdf;
+use Dompdf\Options;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Error\RuntimeError;
+use Twig\Error\SyntaxError;
+
+final readonly class ShipmentReceiptProvider implements ProviderInterface
+{
+    public function __construct(
+        private Environment $twig,
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    /**
+     * @throws RuntimeError
+     * @throws SyntaxError
+     * @throws LoaderError
+     */
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
+    {
+        $id = $uriVariables['id'] ?? null;
+        if (null === $id) {
+            throw new NotFoundHttpException('Shipment not found.');
+        }
+
+        $shipment = $this->entityManager->getRepository(Shipment::class)->find($id);
+        if (!$shipment instanceof Shipment) {
+            throw new NotFoundHttpException('Shipment not found.');
+        }
+
+        $options = new Options();
+        $options->set('isRemoteEnabled', true);
+
+        $dompdf = new Dompdf($options);
+        $html   = $this->twig->render('shipment_voucher.html.twig', [
+            'shipment' => $shipment,
+        ]);
+
+        $dompdf->loadHtml($html);
+        $dompdf->setPaper('A4');
+        $dompdf->render();
+
+        $filename = sprintf('bon-expedition-%d.pdf', $shipment->getId());
+
+        return new Response($dompdf->output(), Response::HTTP_OK, [
+            'Content-Type'        => 'application/pdf',
+            'Content-Disposition' => 'inline; filename="'.$filename.'"',
+        ]);
+    }
+}
diff --git a/src/State/ShipmentWeighingProvider.php b/src/State/ShipmentWeighingProvider.php
new file mode 100644
index 0000000..8a14d63
--- /dev/null
+++ b/src/State/ShipmentWeighingProvider.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\State;
+
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use App\Dto\PontBasculeReading;
+use App\Exception\PontBasculeException;
+use App\Service\PontBasculeService;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+final readonly class ShipmentWeighingProvider implements ProviderInterface
+{
+    public function __construct(
+        private PontBasculeService $pontBasculeService,
+    ) {}
+
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): ?PontBasculeReading
+    {
+        try {
+            $result = $this->pontBasculeService->fetch();
+        } catch (PontBasculeException $exception) {
+            throw new HttpException(500, $exception->getMessage(), $exception);
+        }
+
+        return $result;
+    }
+}
diff --git a/templates/reception_voucher.html.twig b/templates/reception_voucher.html.twig
index 6c94ccd..138fbc4 100644
--- a/templates/reception_voucher.html.twig
+++ b/templates/reception_voucher.html.twig
@@ -141,16 +141,18 @@
 
         <td style="width:30%; text-align:right; vertical-align:top; font-size: 14px;">
             <div style="display:inline-block; width:75mm; line-height:1.3;">
-                <strong>{{ reception.supplier.name }}</strong><br>
-                <span>{{ reception.address.street }}</span><br>
-                {% if reception.address.street2 %}
+                <strong>{{ reception.supplier ? reception.supplier.name : '-' }}</strong><br>
+                <span>{{ reception.address ? reception.address.street : '' }}</span><br>
+                {% if reception.address and reception.address.street2 %}
                     <span>{{ reception.address.street2 }}</span><br>
                 {% endif %}
-                <span>{{ reception.address.postalCode }} {{ reception.address.city }}</span><br>
-                {% if reception.supplier.phone %}
+                {% if reception.address %}
+                    <span>{{ reception.address.postalCode }} {{ reception.address.city }}</span><br>
+                {% endif %}
+                {% if reception.supplier and reception.supplier.phone %}
                     <span>{{ reception.supplier.phone }}</span><br>
                 {% endif %}
-                {% if reception.supplier.email %}
+                {% if reception.supplier and reception.supplier.email %}
                     <span>{{ reception.supplier.email}}</span><br>
                 {% endif %}
             </div>
@@ -168,7 +170,9 @@
         <th style="width:25%; text-align:center; white-space:nowrap;">N° réception</th>
     </tr>
     <tr>
-        <td style="width:55%; text-align:center;">{{ reception.supplier.name }}</td>
+        <td style="width:55%; text-align:center;">
+            {{ reception.supplier ? reception.supplier.name : '-' }}
+        </td>
         <td style="width:20%; text-align:center; white-space:nowrap;">
             {{ reception.receptionDate|date('d/m/Y') }}
         </td>
@@ -189,13 +193,11 @@
         <tbody>
         <tr>
             <td style="width:75%;">
-                <strong>{{ reception.receptionType.label }}</strong><br><br>
-
+                <strong>{{ reception.receptionType ? reception.receptionType.label : '-' }}</strong><br><br>
                 <div class="bigtable-notes">
                     {% set grossWeight = null %}
                     {% set tareWeight = null %}
-
-                    {% for weight in reception.weights %}
+                    {% for weight in reception.weights|default([]) %}
                         {% if weight.type == 'gross' %}
                             {% set grossWeight = weight %}
                             <p>Poids à plein : {{ grossWeight.weight }}kg (pesée n°{{ grossWeight.dsd }} {{ grossWeight.weighedAt|date('d/m/Y H:i:s') }})</p>
@@ -219,45 +221,57 @@
         <tr class="border-bottom">
             <td>
                 <strong>
-                    {% if reception.merchandiseType %}
-                        {{ reception.merchandiseType.label }}
-                    {% else %}
-                        -
-                    {% endif %}
+                    Type de bovins
                 </strong>
                 <br><br>
 
                 <div class="bigtable-notes">
-                    {% if reception.merchandiseType and reception.merchandiseType.code == 'AUTRES' and reception.merchandiseDetail %}
-                        <p><strong>Précision</strong> : {{ reception.merchandiseDetail }}</p>
-                    {% endif %}
-
-                    {% if reception.merchandiseType and reception.merchandiseType.code == 'GRANULE' %}
-                        {% set pelletGroups = {} %}
-                        {% for selection in reception.pelletBuildings %}
-                            {% set pelletLabel = selection.pelletType.label %}
-                            {% if pelletGroups[pelletLabel] is not defined %}
-                                {% set pelletGroups = pelletGroups|merge({ (pelletLabel): [] }) %}
-                            {% endif %}
-                            {% set pelletGroups = pelletGroups|merge({
-                                (pelletLabel): pelletGroups[pelletLabel]|merge([selection.building.label])
-                            }) %}
-                        {% endfor %}
-
-                        {% for pelletLabel, buildingLabels in pelletGroups %}
-                            <p><strong>{{ pelletLabel }}</strong> : {{ buildingLabels|join(', ') }}</p>
+                    {% if reception.receptionType and reception.receptionType.code == 'BOVINS' %}
+                        {% if reception.bovinesTypes is not empty %}
+                            {% for entry in reception.bovinesTypes %}
+                                <p>
+                                    {{ entry.bovineType ? entry.bovineType.label : '-' }} : {{ entry.quantity ?? 0 }}
+                                </p>
+                            {% endfor %}
                         {% else %}
-                            <p>Aucun dépôt de granulés renseigné.</p>
-                        {% endfor %}
+                            <p>-</p>
+                        {% endif %}
+
+                        {% if reception.bovineDetail %}
+                            <p>Autres : {{ reception.bovineDetail }}</p>
+                        {% endif %}
                     {% else %}
-                        {% set buildingLabels = [] %}
-                        {% for building in reception.buildings %}
-                            {% set buildingLabels = buildingLabels|merge([building.label]) %}
-                        {% endfor %}
-                        {% if buildingLabels %}
-                            <p><strong>Ferme</strong> : {{ buildingLabels|join(', ') }}</p>
+                        {% if reception.merchandiseType and reception.merchandiseType.code == 'AUTRES' and reception.merchandiseDetail %}
+                            <p><strong>Précision</strong> : {{ reception.merchandiseDetail }}</p>
+                        {% endif %}
+
+                        {% if reception.merchandiseType and reception.merchandiseType.code == 'GRANULE' %}
+                            {% set pelletGroups = {} %}
+                            {% for selection in reception.pelletBuildings|default([]) %}
+                                {% set pelletLabel = selection.pelletType.label %}
+                                {% if pelletGroups[pelletLabel] is not defined %}
+                                    {% set pelletGroups = pelletGroups|merge({ (pelletLabel): [] }) %}
+                                {% endif %}
+                                {% set pelletGroups = pelletGroups|merge({
+                                    (pelletLabel): pelletGroups[pelletLabel]|merge([selection.building.label])
+                                }) %}
+                            {% endfor %}
+
+                            {% for pelletLabel, buildingLabels in pelletGroups %}
+                                <p><strong>{{ pelletLabel }}</strong> : {{ buildingLabels|join(', ') }}</p>
+                            {% else %}
+                                <p>Aucun dépôt de granulés renseigné.</p>
+                            {% endfor %}
                         {% else %}
-                            <p>Aucun bâtiment renseigné.</p>
+                            {% set buildingLabels = [] %}
+                            {% for building in reception.buildings|default([]) %}
+                                {% set buildingLabels = buildingLabels|merge([building.label]) %}
+                            {% endfor %}
+                            {% if buildingLabels %}
+                                <p><strong>Ferme</strong> : {{ buildingLabels|join(', ') }}</p>
+                            {% else %}
+                                <p>Aucun bâtiment renseigné.</p>
+                            {% endif %}
                         {% endif %}
                     {% endif %}
                 </div>
@@ -273,9 +287,9 @@
     <tr>
         <td style="width:60%; padding-right:8mm; vertical-align:top;">
             <div class="meta">
-                Transporteur : <strong>{{ reception.carrier.name }}</strong><br>
-                Mode de livraison : <strong>{{ reception.truck.name }}</strong><br>
-                Immatriculation : <strong>{{ reception.licensePlate }}</strong><br><br>
+                Transporteur : <strong>{{ reception.carrier ? reception.carrier.name : '-' }}</strong><br>
+                Mode de livraison : <strong>{{ reception.truck ? reception.truck.name : '-' }}</strong><br>
+                Immatriculation : <strong>{{ reception.licensePlate ?? '-' }}</strong><br><br>
             </div>
         </td>
 
diff --git a/templates/shipment_voucher.html.twig b/templates/shipment_voucher.html.twig
new file mode 100644
index 0000000..eec1245
--- /dev/null
+++ b/templates/shipment_voucher.html.twig
@@ -0,0 +1,292 @@
+<!doctype html>
+<html lang="fr">
+<head>
+    <meta charset="UTF-8">
+
+    <style>
+        @page {
+            margin: 56px 56px;
+        }
+
+        body {
+            font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+            font-size: 13px;
+            margin: 0;
+            color: #000;
+        }
+
+        p {
+            margin: 0;
+        }
+
+        em {
+            font-style: normal;
+        }
+
+        .company-block {
+            font-size: 14px;
+            text-align: left;
+            line-height: 1.3;
+        }
+
+        .box {
+            border: 1px solid #000;
+            border-radius: 10px;
+            padding: 10px;
+            font-size: 16px;
+            height: 80px;
+        }
+
+        .title {
+            text-align: center;
+            font-size: 18pt;
+            font-weight: 700;
+            margin: 64px 0 20px 0;
+        }
+
+        .info-table {
+            margin-bottom: 24px;
+            width: 100%;
+            border-collapse: collapse;
+            table-layout: fixed;
+        }
+
+        .info-table th {
+            font-size: 16px;
+        }
+
+        table {
+            width: 100%;
+            border-collapse: collapse;
+        }
+
+        th, td {
+            border: 1px solid #333;
+            padding: 4px 6px;
+            vertical-align: top;
+            font-size: 12px;
+        }
+
+        th {
+            text-align: center;
+            font-weight: 700;
+        }
+
+        .layout, .layout td {
+            border: none !important;
+            padding: 0;
+        }
+
+        .bigtable-wrap {
+            border: 1px solid #000;
+            height: 360px;
+            margin-bottom: 10px;
+        }
+
+        .bigtable {
+            width: 100%;
+            height: 100%;
+            border: none;
+            border-collapse: collapse;
+            table-layout: fixed;
+        }
+
+        .bigtable th,
+        .bigtable td {
+            font-size: 16px;
+            border: 1px solid #333;
+        }
+
+        .bigtable thead th {
+            border-top: 0;
+        }
+
+        .bigtable tbody tr:last-child td {
+            border-bottom: 0;
+        }
+
+        .bigtable tr th:first-child,
+        .bigtable tr td:first-child {
+            border-left: 0;
+        }
+
+        .bigtable tr th:last-child,
+        .bigtable tr td:last-child {
+            border-right: 0;
+        }
+
+        .bigtable thead th {
+            border-bottom: 0;
+        }
+
+        .bigtable tbody tr:first-child td {
+            border-top: 1px solid #333;
+        }
+
+        .bigtable-notes {
+            font-size: 14px;
+            line-height: 1.25;
+        }
+
+        .border-bottom {
+            border-bottom: 1px solid #000;
+        }
+
+        .footer-block {
+            page-break-inside: avoid;
+        }
+
+        .signature-box {
+            height: 130px;
+            margin-bottom: 10px;
+            border: 0.5px solid #000;
+
+            padding: 6px 10px;
+        }
+
+        .meta {
+            font-size: 16px;
+            line-height: 1.35;
+        }
+    </style>
+</head>
+
+<body>
+
+<!-- HEADER -->
+<table class="layout" style="width:100%;">
+    <tr>
+        <td style="width:70%; vertical-align:top;">
+            <table class="layout" style="width:100%;">
+                <tr>
+                    <td class="company-block" style="padding:0; border:none;">
+                        <strong>SCEA LES NAUDS</strong><br>
+                        14 Allée d’Argenson<br>
+                        Z.I Nord – Secteur Est<br>
+                        86100 CHATELLERAULT<br>
+                        Tel. : 05 49 20 09 10<br>
+                        Email : lpc.contacts@lpc-liot.fr<br>
+                        RCS Châtellerault B 444 262 455
+                    </td>
+                </tr>
+            </table>
+        </td>
+
+        <td style="width:30%; text-align:right; vertical-align:top; font-size: 14px;">
+            <div style="display:inline-block; width:75mm; line-height:1.3;">
+                <strong>{{ shipment.customer ? shipment.customer.label : '-' }}</strong><br>
+                <span>{{ shipment.address ? shipment.address.street : '' }}</span><br>
+                {% if shipment.address and shipment.address.street2 %}
+                    <span>{{ shipment.address.street2 }}</span><br>
+                {% endif %}
+                {% if shipment.address %}
+                    <span>{{ shipment.address.postalCode }} {{ shipment.address.city }}</span><br>
+                {% endif %}
+            </div>
+        </td>
+    </tr>
+</table>
+
+<div class="title">BON D'EXPEDITION</div>
+
+<!-- INFOS (code/date/num) -->
+<table class="info-table">
+    <tr>
+        <th style="width:55%; text-align:center;">Code client</th>
+        <th style="width:20%; text-align:center; white-space:nowrap;">Date</th>
+        <th style="width:25%; text-align:center; white-space:nowrap;">N° expédition</th>
+    </tr>
+    <tr>
+        <td style="width:55%; text-align:center;">
+            {{ shipment.customer ? shipment.customer.code : '-' }}
+        </td>
+        <td style="width:20%; text-align:center; white-space:nowrap;">
+            {{ shipment.shipmentDate|date('d/m/Y') }}
+        </td>
+        <td style="width:25%; text-align:center; white-space:nowrap;">
+            {{ shipment.identificationNumber ?? '-' }}
+        </td>
+    </tr>
+</table>
+<!-- GRAND TABLEAU -->
+<div class="bigtable-wrap">
+    <table class="bigtable">
+        <thead>
+        <tr>
+            <th style="width:75%; text-align:center;">Désignation</th>
+            <th style="width:25%; text-align:center; white-space:nowrap;">Qté expédiée (kg)</th>
+        </tr>
+        </thead>
+
+        <tbody>
+        {% set grossWeight = null %}
+        {% set tareWeight = null %}
+        <tr>
+            <td style="width:75%;">
+                <strong>Expédition</strong><br><br>
+                <div class="bigtable-notes">
+                    {% for weight in shipment.weights %}
+                        {% if weight.type == 'gross' %}
+                            {% set grossWeight = weight %}
+                            <p>Poids à plein : {{ grossWeight.weight }}kg (pesée
+                                n°{{ grossWeight.dsd }} {{ grossWeight.weighedAt|date('d/m/Y H:i:s') }})</p>
+                        {% elseif weight.type == 'tare' %}
+                            {% set tareWeight = weight %}
+                            <p>Poids à vide : {{ tareWeight.weight }}kg (pesée
+                                n°{{ tareWeight.dsd }} {{ tareWeight.weighedAt|date('d/m/Y H:i:s') }})</p>
+                        {% endif %}
+                    {% endfor %}
+                </div>
+            </td>
+            <td style="width:25%; text-align:center; white-space:nowrap;">
+                {% if grossWeight and tareWeight %}
+                    {{ grossWeight.weight - tareWeight.weight }}
+                {% else %}
+                    0
+                {% endif %}
+            </td>
+        </tr>
+        <tr class="border-bottom">
+            <td>
+                <strong>Bovin</strong><br><br>
+                <div class="bigtable-notes">
+                    {% if shipment.bovinShipments is not empty %}
+                        {% for entry in shipment.bovinShipments %}
+                            <p>
+                                {{ entry.shipmentType ? entry.shipmentType.label : '-' }} :
+                                {{ entry.nbBovinSend ?? 0 }}
+                            </p>
+                        {% endfor %}
+                    {% else %}
+                        <p>-</p>
+                    {% endif %}
+                </div>
+
+            </td>
+            <td style="width:25%; text-align:center; white-space:nowrap;">
+            </td>
+        </tr>
+        </tbody>
+    </table>
+</div>
+
+<!-- BAS : meta à gauche / signatures à droite -->
+<table class="layout footer-block">
+    <tr>
+        <td style="width:60%; padding-right:8mm; vertical-align:top;">
+            <div class="meta">
+                <p>Transporteur : {{ shipment.carrier ? shipment.carrier.name : '-' }}</p>
+                <p>Mode de livraison : {{ shipment.truck ? shipment.truck.name : '-' }}</p>
+                <p>Immatriculation : {{ shipment.licencePlate ?? '-' }}</p>
+            </div>
+        </td>
+
+        <td style="width:40%; vertical-align:top;">
+            <div class="box signature-box">Signature les Nauds :</div>
+            <div class="box signature-box">Signature transporteur :</div>
+        </td>
+    </tr>
+</table>
+
+</body>
+</html>
-- 
2.39.5


From 74af5d30bab9d534d6c52edd31a8060fe051a6c4 Mon Sep 17 00:00:00 2001
From: kevin <kevin@yuno.malio.fr>
Date: Thu, 12 Feb 2026 08:19:47 +0100
Subject: [PATCH 09/12] feat : ajout d'une page de creation d'une expedition

---
 .../components/shipment/shipment-weight.vue   |  4 +--
 frontend/composables/useWeighing.ts           | 36 +++++++------------
 frontend/services/bovin-shipment.ts           | 10 +-----
 frontend/services/dto/bovin-shipment-data.ts  | 10 ++++++
 frontend/services/weight.ts                   | 19 +++++++++-
 5 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/frontend/components/shipment/shipment-weight.vue b/frontend/components/shipment/shipment-weight.vue
index 07bcf47..cf4d7f0 100644
--- a/frontend/components/shipment/shipment-weight.vue
+++ b/frontend/components/shipment/shipment-weight.vue
@@ -88,8 +88,8 @@ const printReceipt = async () => {
         return
     }
 
-/*    shipmentStore.clearCurrent()
-    await router.push('/')*/
+    shipmentStore.clearCurrent()
+    await router.push('/')
 }
 
 // Récupère le poids dès l'arrivée sur l'écran
diff --git a/frontend/composables/useWeighing.ts b/frontend/composables/useWeighing.ts
index 25adbea..f632b5b 100644
--- a/frontend/composables/useWeighing.ts
+++ b/frontend/composables/useWeighing.ts
@@ -1,34 +1,22 @@
 import type {Ref} from 'vue'
 import {computed, ref} from 'vue'
 import type {ReceptionData, ReceptionPayload, WeightEntryData} from '~/services/dto/reception-data'
-import type {ShipmentData, ShipmentPayload, WeightShipmentEntryData } from '~/services/dto/shipment-data'
 import type {WeightData} from '~/services/dto/weight-data'
 import {getWeight} from '~/services/reception'
 import {getWeightShipment} from '~/services/shipment'
 import {createWeight, updateWeight} from '~/services/weight'
+import type {UseWeighingShipmentOptions, UseWeighingOptions} from '~/services/weight'
+import type {WeightShipmentEntryData} from "~/services/dto/shipment-data";
 
 export type WeighingMode = 'gross' | 'tare'
 
-type UseWeighingOptions = {
-    mode: WeighingMode
-    reception: Ref<ReceptionData | null>
-    updateReception: (id: number, payload: ReceptionPayload) => Promise<ReceptionData | null>
-    loadReception?: (id: number) => Promise<ReceptionData | null>
-}
-
-type UseWeighingShipmentOptions = {
-    modeShipment: WeighingMode
-    shipment: Ref<ShipmentData | null>
-    updateShipment: (id: number, payload: ShipmentPayload) => Promise<ShipmentData | null>
-    loadShipment?: (id: number) => Promise<ShipmentData | null>
-}
 
 export const useWeighing = ({
-    mode,
-    reception,
-    updateReception,
-    loadReception
-}: UseWeighingOptions) => {
+                                mode,
+                                reception,
+                                updateReception,
+                                loadReception
+                            }: UseWeighingOptions) => {
     const weightData = ref<WeightData | null>(null)
     const isFetching = ref(false)
 
@@ -108,11 +96,11 @@ export const useWeighing = ({
 }
 
 export const useWeighingShipment = ({
-                                modeShipment,
-                                shipment,
-                                updateShipment,
-                                loadShipment
-                            }: UseWeighingShipmentOptions) => {
+                                        modeShipment,
+                                        shipment,
+                                        updateShipment,
+                                        loadShipment
+                                    }: UseWeighingShipmentOptions) => {
     const weightData = ref<WeightData | null>(null)
     const isFetching = ref(false)
 
diff --git a/frontend/services/bovin-shipment.ts b/frontend/services/bovin-shipment.ts
index 45871dc..d14e855 100644
--- a/frontend/services/bovin-shipment.ts
+++ b/frontend/services/bovin-shipment.ts
@@ -1,14 +1,6 @@
 import { useApi } from '~/composables/useApi'
 import type { BovinShipmentData } from '~/services/dto/bovin-shipment-data'
-export type BovinShipmentListResponse =
-    | BovinShipmentData[]
-    | { 'hydra:member'?: BovinShipmentData[] }
-
-export type ShipmentBovinePayload = {
-    nbBovinSend: number
-    shipment: string
-    shipmentType: string
-}
+import type { ShipmentBovinePayload, BovinShipmentListResponse } from '~/services/dto/bovin-shipment-data'
 
 export async function getBovinShipmentList(
     shipmentIri: string
diff --git a/frontend/services/dto/bovin-shipment-data.ts b/frontend/services/dto/bovin-shipment-data.ts
index e3bdd42..6bbca73 100644
--- a/frontend/services/dto/bovin-shipment-data.ts
+++ b/frontend/services/dto/bovin-shipment-data.ts
@@ -6,3 +6,13 @@ export interface BovinShipmentData {
     shipment?: string | null
     shipmentType?: ShipmentTypeData | null
 }
+
+export type ShipmentBovinePayload = {
+    nbBovinSend: number
+    shipment: string
+    shipmentType: string
+}
+
+export type BovinShipmentListResponse =
+    | BovinShipmentData[]
+    | { 'hydra:member'?: BovinShipmentData[] }
diff --git a/frontend/services/weight.ts b/frontend/services/weight.ts
index 2e03c1f..6c9243c 100644
--- a/frontend/services/weight.ts
+++ b/frontend/services/weight.ts
@@ -1,5 +1,8 @@
 import { useApi } from '~/composables/useApi'
-import type { WeightEntryData } from '~/services/dto/reception-data'
+import type {ReceptionData, ReceptionPayload, WeightEntryData} from '~/services/dto/reception-data'
+import type {Ref} from "vue";
+import type {ShipmentData, ShipmentPayload} from "~/services/dto/shipment-data";
+import type {WeighingMode} from "~/composables/useWeighing";
 
 export type WeightPayload = {
     reception?: string
@@ -22,3 +25,17 @@ export async function updateWeight(id: number, payload: Partial<WeightPayload>)
     toastSuccessKey: 'success.weight.update'
     })
 }
+
+export type UseWeighingShipmentOptions = {
+    modeShipment: WeighingMode
+    shipment: Ref<ShipmentData | null>
+    updateShipment: (id: number, payload: ShipmentPayload) => Promise<ShipmentData | null>
+    loadShipment?: (id: number) => Promise<ShipmentData | null>
+}
+
+export type UseWeighingOptions = {
+    mode: WeighingMode
+    reception: Ref<ReceptionData | null>
+    updateReception: (id: number, payload: ReceptionPayload) => Promise<ReceptionData | null>
+    loadReception?: (id: number) => Promise<ReceptionData | null>
+}
-- 
2.39.5


From b4e024590ee827f9a609d8f678538ccb2b04b174 Mon Sep 17 00:00:00 2001
From: kevin <kevin@yuno.malio.fr>
Date: Thu, 12 Feb 2026 08:30:34 +0100
Subject: [PATCH 10/12] feat : changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c4a728..02a1d49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,8 @@ Ajouter dans le fichier .env du frontend
 * [#318] Affichage modification reception terminée
 * [#320] Affichage modification reception terminée suite
 * [#271] Créer une nouvelle expédition (étape 1)
+* [#272] Créer une nouvelle expédition (étape 2)
+* [#273] Créer une nouvelle expédition (étape 3)
 * [#256] Créer une nouvelle réception (étape 3 - bovin)
 * [#314] Création d'une page d'administration : listing des utilisateurs
 
-- 
2.39.5


From 886b90215a97bf18c0615fb4c7abd112ccbbd92e Mon Sep 17 00:00:00 2001
From: kevin <kevin@yuno.malio.fr>
Date: Thu, 12 Feb 2026 08:58:29 +0100
Subject: [PATCH 11/12] feat : lister les expeditions terminees

---
 CHANGELOG.md                                |  1 +
 frontend/pages/index.vue                    |  2 +-
 frontend/pages/shipment/finish-shipment.vue | 81 +++++++++++++++++++++
 frontend/services/dto/shipment-data.ts      |  2 +
 4 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 frontend/pages/shipment/finish-shipment.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02a1d49..4076aa1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ Ajouter dans le fichier .env du frontend
 * [#273] Créer une nouvelle expédition (étape 3)
 * [#256] Créer une nouvelle réception (étape 3 - bovin)
 * [#314] Création d'une page d'administration : listing des utilisateurs
+* [#276] Lister les expéditions terminées
 
 ### Changed
 
diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue
index 52d3da7..6a06e55 100644
--- a/frontend/pages/index.vue
+++ b/frontend/pages/index.vue
@@ -9,7 +9,7 @@
         <card-link label="EXPÉDITIONS EN ATTENTE" link="/" iconName="mdi:truck-cargo-container" />
         <card-link label="CASES" link="/" iconName="mdi:cube-outline" />
         <card-link label="RÉCEPTIONS FINIES" link="/reception/finish-reception" iconName="mdi:truck-check-outline" />
-        <card-link label="EXPÉDITIONS FINIES" link="/" iconName="mdi:truck-delivery-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" />
     </div>
 </template>
diff --git a/frontend/pages/shipment/finish-shipment.vue b/frontend/pages/shipment/finish-shipment.vue
new file mode 100644
index 0000000..59c340b
--- /dev/null
+++ b/frontend/pages/shipment/finish-shipment.vue
@@ -0,0 +1,81 @@
+<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>
+    </div>
+
+    <div class="ps-20 ">
+        <div class="mt-6 border border-slate-200 mb-16 ">
+            <div class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
+                <div>Numéro</div>
+                <div>Date</div>
+                <div>Client</div>
+                <div>Adresse</div>
+                <div>Type d'expéditon</div>
+                <div>Poids</div>
+            </div>
+            <div
+                v-for="shipment in shipmentList"
+                :key="shipment
+               .id"
+                class="grid grid-cols-6 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
+                role="button"
+                tabindex="0"
+                @click="goToshipment(shipment.id)"
+            >
+                <div>{{ shipment.identificationNumber }}</div>
+                <div>{{ shipment.shipmentDate }}</div>
+                <div>{{ shipment.customer?.label }}</div>
+                <div>{{ shipment.address?.fullAddress }}</div>
+                <div>
+                    <template v-if="formatBovinShipmentLines(shipment).length">
+                        <div
+                            v-for="(line, index) in formatBovinShipmentLines(shipment)"
+                            :key="index"
+                            class="leading-5"
+                        >
+                            {{ line }}
+                        </div>
+                    </template>
+                </div>
+                <div>{{ formatWeighing(shipment, 'gross') }} | {{ formatWeighing(shipment, 'tare') }}</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import type {ShipmentData} from "~/services/dto/shipment-data";
+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) {
+        return '—'
+    }
+    return `${entry.weight} kg`
+}
+
+const formatBovinShipmentLines = (shipment: ShipmentData) => {
+    if (!shipment.bovinShipments?.length) {
+        return []
+    }
+    return shipment.bovinShipments.map((entry) => {
+        const label = typeof entry.shipmentType === 'string'
+            ? entry.shipmentType
+            : entry.shipmentType?.label
+        return `${label ?? '—'} : ${entry.nbBovinSend ?? '—'}`
+    })
+}
+
+const goToshipment = (id: number) => {
+    //router.push(`/shipment/update/${id}`)
+}
+
+onMounted(async () => {
+    shipmentList.value = await getShipmentList(true)
+})
+</script>
diff --git a/frontend/services/dto/shipment-data.ts b/frontend/services/dto/shipment-data.ts
index a78016a..8a5dbfd 100644
--- a/frontend/services/dto/shipment-data.ts
+++ b/frontend/services/dto/shipment-data.ts
@@ -1,6 +1,7 @@
 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";
 
 export interface ShipmentTypeData {
     id: number
@@ -21,6 +22,7 @@ export type ShipmentData = {
     shipmentDate: string
     currentStep: number
     isValid: boolean
+    address?: AddressData | null
     carrier?: CarrierData | null
     truck?: TruckData | null
     customer?: CustomerData | null
-- 
2.39.5


From 6d2c7a0081bc4138ec6f5763ea1dce85737caa14 Mon Sep 17 00:00:00 2001
From: kevin <kevin@yuno.malio.fr>
Date: Thu, 12 Feb 2026 09:15:49 +0100
Subject: [PATCH 12/12] feat : lister les expeditions terminees

---
 CHANGELOG.md                                 |  1 +
 frontend/pages/index.vue                     |  2 +-
 frontend/pages/shipment/waiting-shipment.vue | 73 ++++++++++++++++++++
 src/Entity/Shipment.php                      |  3 +
 4 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 frontend/pages/shipment/waiting-shipment.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4076aa1..a8b9fc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ Ajouter dans le fichier .env du frontend
 * [#273] Créer une nouvelle expédition (étape 3)
 * [#256] Créer une nouvelle réception (étape 3 - bovin)
 * [#314] Création d'une page d'administration : listing des utilisateurs
+* [#275] Lister les expéditions en attente
 * [#276] Lister les expéditions terminées
 
 ### Changed
diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue
index 6a06e55..67079c2 100644
--- a/frontend/pages/index.vue
+++ b/frontend/pages/index.vue
@@ -6,7 +6,7 @@
         <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="/" iconName="mdi:truck-cargo-container" />
+        <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="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" />
diff --git a/frontend/pages/shipment/waiting-shipment.vue b/frontend/pages/shipment/waiting-shipment.vue
new file mode 100644
index 0000000..4a35459
--- /dev/null
+++ b/frontend/pages/shipment/waiting-shipment.vue
@@ -0,0 +1,73 @@
+<template>
+    <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>
+        </div>
+    </div>
+
+    <div class="ps-20 ">
+        <div class="mt-6 border border-slate-200 mb-16 ">
+            <div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
+                <div>Client</div>
+                <div>Adresse</div>
+                <div>Type d'expéditions</div>
+                <div>Transporteur</div>
+                <div>Immatriculation</div>
+            </div>
+            <div
+                v-for="shipment in shipmentList"
+                :key="shipment.id"
+                class="grid grid-cols-5 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
+                role="button"
+                tabindex="0"
+                @click="goToShipment(shipment.id)"
+                @keydown.enter="goToShipment(shipment.id)"
+            >
+                <div>{{ shipment.customer?.label }}</div>
+                <div>{{ shipment.address?.fullAddress }}</div>
+                <div>
+                    <template v-if="formatBovinShipmentLines(shipment).length">
+                        <div
+                            v-for="(line, index) in formatBovinShipmentLines(shipment)"
+                            :key="index"
+                            class="leading-5"
+                        >
+                            {{ line }}
+                        </div>
+                    </template>
+                </div>
+                <div>{{ shipment.carrier?.name }}</div>
+                <div>{{ shipment.licencePlate }}</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+
+import type {ShipmentData} from "~/services/dto/shipment-data";
+import {getShipmentList} from "~/services/shipment";
+
+const shipmentList = ref<ShipmentData[]>()
+const router = useRouter()
+
+const goToShipment = (id: number) => {
+    router.push(`/shipment/${id}`)
+}
+const formatBovinShipmentLines = (shipment: ShipmentData) => {
+    if (!shipment.bovinShipments?.length) {
+        return []
+    }
+    return shipment.bovinShipments.map((entry) => {
+        const label = typeof entry.shipmentType === 'string'
+            ? entry.shipmentType
+            : entry.shipmentType?.label
+        return `${label ?? '—'} : ${entry.nbBovinSend ?? '—'}`
+    })
+}
+
+onMounted(async () => {
+    shipmentList.value = await getShipmentList(false)
+})
+</script>
diff --git a/src/Entity/Shipment.php b/src/Entity/Shipment.php
index 8bcaed4..91b6f4e 100644
--- a/src/Entity/Shipment.php
+++ b/src/Entity/Shipment.php
@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace App\Entity;
 
+use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter;
+use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
@@ -26,6 +28,7 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 #[ORM\Entity]
 #[ORM\HasLifecycleCallbacks]
 #[ORM\Table(name: 'shipment')]
+#[ApiFilter(BooleanFilter::class, properties: ['isValid'])]
 #[ApiResource(
     operations: [
         new Get(
-- 
2.39.5