diff --git a/src/app/components/deliverer-table/deliverer-table.ts b/src/app/components/deliverer-table/deliverer-table.ts
index ca1b4c8..c688c9f 100644
--- a/src/app/components/deliverer-table/deliverer-table.ts
+++ b/src/app/components/deliverer-table/deliverer-table.ts
@@ -79,20 +79,12 @@ export class DelivererTable implements OnInit {
         }
 
         try {
-
             const deliverers = updateDelivererComponent.delivererForm.getRawValue();
             await firstValueFrom(this.deliverersService.updateDelivererEndpoint(id, deliverers))
 
-            this.notificationService.success(
-                'Success',
-                'Transporteur modifié'
-            )
+            this.notificationService.success('Success', 'Transporteur modifié')
         } catch (e) {
-            console.error(e);
-            this.notificationService.error(
-                'Erreur',
-                'Erreur lors de la modification'
-            )
+            this.notificationService.error('Erreur', 'Erreur lors de la modification')
         }
     }
 
diff --git a/src/app/components/deliverery-note-table/deliverery-note-table.ts b/src/app/components/deliverery-note-table/deliverery-note-table.ts
index 205c26f..4a31036 100644
--- a/src/app/components/deliverery-note-table/deliverery-note-table.ts
+++ b/src/app/components/deliverery-note-table/deliverery-note-table.ts
@@ -116,25 +116,6 @@ export class DelivereryNoteTable implements OnInit {
         this.deliveryNotesLoading.set(false)
     }
 
-    selectedDeliveryNote: GetDeliveryNoteDto | null = null;
-    openEditModal(deliveryNote: GetDeliveryNoteDto) {
-        this.selectedDeliveryNote = { ...deliveryNote };
-        this.modal().showModal();
-    }
-
-    async onModalOk(id: number, updateDelivereryNoteComponent: DelivereryNoteForm, modal: ModalNav) {
-        if (!this.selectedDeliveryNote) return;
-
-        await this.edit(id, updateDelivereryNoteComponent);
-        updateDelivereryNoteComponent.deliveryNoteForm.reset();
-        modal.isVisible = false;
-        await this.fetchDeliveryNotes();
-    }
-
-    onModalCancel(modal: ModalNav) {
-        modal.isVisible = false;
-    }
-
     async edit(id: number, updateDelivereryNoteComponent: DelivereryNoteForm) {
         if (updateDelivereryNoteComponent.deliveryNoteForm.invalid) {
             this.notificationService.error('Erreur', 'Formulaire invalide');
@@ -176,4 +157,22 @@ export class DelivereryNoteTable implements OnInit {
         }
     }
 
+    selectedDeliveryNote: GetDeliveryNoteDto | null = null;
+    openEditModal(deliveryNote: GetDeliveryNoteDto) {
+        this.selectedDeliveryNote = { ...deliveryNote };
+        this.modal().showModal();
+    }
+
+    async onModalOk(id: number, updateDelivereryNoteComponent: DelivereryNoteForm, modal: ModalNav) {
+        if (!this.selectedDeliveryNote) return;
+
+        await this.edit(id, updateDelivereryNoteComponent);
+        updateDelivereryNoteComponent.deliveryNoteForm.reset();
+        modal.isVisible = false;
+        await this.fetchDeliveryNotes();
+    }
+
+    onModalCancel(modal: ModalNav) {
+        modal.isVisible = false;
+    }
 }
diff --git a/src/app/components/quotation-form/quotation-form.html b/src/app/components/quotation-form/quotation-form.html
index 0ca8812..b0b4420 100644
--- a/src/app/components/quotation-form/quotation-form.html
+++ b/src/app/components/quotation-form/quotation-form.html
@@ -1,11 +1,11 @@
-<form nz-form nzLayout="horizontal" [formGroup]="QuotationForm">
+<form nz-form nzLayout="horizontal" [formGroup]="quotationForm">
     <nz-form-item nz-flex>
         <nz-form-label nzSpan="9">
             Message du devis
         </nz-form-label>
 
         <nz-form-control nzSpan="12">
-            <input nz-input placeholder="Message du devis" formControlName="quotationMessage">
+            <input nz-input placeholder="Message du devis" formControlName="message">
         </nz-form-control>
     </nz-form-item>
 
@@ -15,7 +15,7 @@
         </nz-form-label>
 
         <nz-form-control nzSpan="12">
-            <input nz-input placeholder="Conditions de vente" formControlName="quotationConditionsSale">
+            <input nz-input placeholder="Conditions de vente" formControlName="conditionsSale">
         </nz-form-control>
     </nz-form-item>
 </form>
diff --git a/src/app/components/quotation-form/quotation-form.ts b/src/app/components/quotation-form/quotation-form.ts
index 0e7a39c..a6aa2b6 100644
--- a/src/app/components/quotation-form/quotation-form.ts
+++ b/src/app/components/quotation-form/quotation-form.ts
@@ -1,10 +1,10 @@
-import { Component } from '@angular/core';
+import {Component, effect, input} from '@angular/core';
 import {FormControl, FormGroup, ReactiveFormsModule, Validators} from "@angular/forms";
 import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
 import {NzInputDirective} from "ng-zorro-antd/input";
 import {NzColDirective} from "ng-zorro-antd/grid";
 import {NzFlexDirective} from "ng-zorro-antd/flex";
-import {NzDatePickerComponent} from "ng-zorro-antd/date-picker";
+import {GetQuotationDto} from "../../services/api";
 
 @Component({
     selector: 'app-quotation-form',
@@ -22,8 +22,20 @@ import {NzDatePickerComponent} from "ng-zorro-antd/date-picker";
     styleUrl: './quotation-form.css',
 })
 export class QuotationForm {
-    QuotationForm: FormGroup = new FormGroup({
-        quotationMessage: new FormControl<string>(null),
-        quotationConditionsSale: new FormControl<string>(null),
+    quotationForm: FormGroup = new FormGroup({
+        message: new FormControl<string>(null, [Validators.required]),
+        conditionsSale: new FormControl<string>(null, [Validators.required]),
     })
+
+    quotation= input<GetQuotationDto>();
+    constructor() {
+        effect(() => {
+            if (this.quotation()) {
+                this.quotationForm.patchValue({
+                    message: this.quotation().message,
+                    conditionsSale: this.quotation().conditionsSale,
+                });
+            }
+        });
+    }
 }
diff --git a/src/app/components/quotation-table/quotation-table.html b/src/app/components/quotation-table/quotation-table.html
index 84ede4d..34309da 100644
--- a/src/app/components/quotation-table/quotation-table.html
+++ b/src/app/components/quotation-table/quotation-table.html
@@ -52,21 +52,13 @@
                 </td>
                 <td>
                     <div style="justify-content: center; display: flex">
-                        <div>
-                            <nz-icon nzType="plus-circle" nzTheme="outline" class="cursor-pointer text-green-700" />
-                        </div>
+                        <nz-icon nzType="plus-circle" nzTheme="outline" class="cursor-pointer text-green-700" />
                         <nz-divider nzType="vertical"></nz-divider>
-                        <app-modal-nav nameIcon="edit" name="Modification du devis" class="cursor-pointer">
-                            <app-quotation-form></app-quotation-form>
-                        </app-modal-nav>
+                        <nz-icon nzType="edit" nzTheme="outline" class="cursor-pointer" (click)="openEditModal(quotation)"></nz-icon>
                         <nz-divider nzType="vertical"></nz-divider>
-                        <div>
-                            <nz-icon nzType="delete" nzTheme="outline" class="cursor-pointer text-red-700" (click)="delete(quotation.id)"/>
-                        </div>
+                        <nz-icon nzType="delete" nzTheme="outline" class="cursor-pointer text-red-700" (click)="delete(quotation.id)"/>
                         <nz-divider nzType="vertical"></nz-divider>
-                        <div>
-                            <nz-icon nzType="export" (click)="export(quotation.id)" nzTheme="outline" class="cursor-pointer text-green-700"/>
-                        </div>
+                        <nz-icon nzType="export" (click)="export(quotation.id)" nzTheme="outline" class="cursor-pointer text-green-700"/>
                     </div>
                 </td>
             </tr>
@@ -74,3 +66,8 @@
     </tbody>
 </nz-table>
 
+<div class="hidden">
+    <app-modal-nav #modalNav nameIcon="edit" [name]="'Modification du devis'" (ok)="onModalOk(selectedQuotation.id, quotationForm, modalNav)" (cancel)="onModalCancel(modalNav)">
+        <app-quotation-form #quotationForm [quotation]="selectedQuotation"></app-quotation-form>
+    </app-modal-nav>
+</div>
\ No newline at end of file
diff --git a/src/app/components/quotation-table/quotation-table.ts b/src/app/components/quotation-table/quotation-table.ts
index 125499a..229ef9f 100644
--- a/src/app/components/quotation-table/quotation-table.ts
+++ b/src/app/components/quotation-table/quotation-table.ts
@@ -1,4 +1,4 @@
-import {Component, inject, OnInit, signal} from '@angular/core';
+import {Component, inject, OnInit, signal, viewChild} from '@angular/core';
 import {NzTableComponent} from "ng-zorro-antd/table";
 import {ModalButton} from "../modal-button/modal-button";
 import {ModalNav} from "../modal-nav/modal-nav";
@@ -9,6 +9,7 @@ import {GetQuotationDto, QuotationsService} from "../../services/api";
 import {NzNotificationService} from "ng-zorro-antd/notification";
 import {firstValueFrom} from "rxjs";
 import {FileService} from "../../services/file.service";
+import {DelivereryNoteForm} from "../deliverery-note-form/deliverery-note-form";
 
 @Component({
     selector: 'app-quotation-table',
@@ -19,6 +20,7 @@ import {FileService} from "../../services/file.service";
         NzIconDirective,
         NzTableComponent,
         QuotationForm,
+        DelivereryNoteForm,
     ],
     templateUrl: './quotation-table.html',
     styleUrl: './quotation-table.css',
@@ -30,6 +32,7 @@ export class QuotationTable implements OnInit {
     private fileService = inject(FileService);
     quotations = signal<GetQuotationDto[]>([]);
     quotationsLoading = signal<boolean>(false);
+    modal = viewChild.required<ModalNav>('modalNav');
 
     async ngOnInit() {
         await this.fetchQuotations();
@@ -84,5 +87,40 @@ export class QuotationTable implements OnInit {
         }
         this.quotationsLoading.set(false)
     }
+
+    async edit(id: number, updateQuotationComponent: QuotationForm) {
+        if (updateQuotationComponent.quotationForm.invalid) {
+            this.notificationService.error('Erreur', 'Formulaire invalide');
+            return;
+        }
+
+        try {
+            const quotations = updateQuotationComponent.quotationForm.getRawValue();
+            await firstValueFrom(this.quotationsService.updateQuotationEndpoint(id, quotations));
+            this.notificationService.success('Success', 'Devis modifié')
+        } catch (e) {
+            console.error(e)
+            this.notificationService.error('Erreur', 'Erreur lors de la modification')
+        }
+    }
+
+    selectedQuotation: GetQuotationDto | null = null;
+    openEditModal(quotation: GetQuotationDto) {
+        this.selectedQuotation = { ...quotation };
+        this.modal().showModal();
+    }
+
+    async onModalOk(id: number, updateQuotationComponent: QuotationForm, modal: ModalNav) {
+        if (!this.selectedQuotation) return;
+
+        await this.edit(id, updateQuotationComponent);
+        updateQuotationComponent.quotationForm.reset();
+        modal.isVisible = false;
+        await this.fetchQuotations();
+    }
+
+    onModalCancel(modal: ModalNav) {
+        modal.isVisible = false;
+    }
 }
 
diff --git a/src/app/services/api/model/update-quotation-dto.ts b/src/app/services/api/model/update-quotation-dto.ts
new file mode 100644
index 0000000..5895594
--- /dev/null
+++ b/src/app/services/api/model/update-quotation-dto.ts
@@ -0,0 +1,16 @@
+/**
+ * PyroFetes
+ *
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export interface UpdateQuotationDto { 
+    message?: string | null;
+    conditionsSale?: string | null;
+}
+