diff --git a/l10n_it_delivery_note/models/stock_delivery_note.py b/l10n_it_delivery_note/models/stock_delivery_note.py
index c8a2671ebc7c..312607946cdb 100644
--- a/l10n_it_delivery_note/models/stock_delivery_note.py
+++ b/l10n_it_delivery_note/models/stock_delivery_note.py
@@ -138,6 +138,12 @@ def _domain_weight_uom(self):
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
     )
 
+    customer_id = fields.Many2one(
+        "res.partner",
+        string="Customer",
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
+    )
+
     carrier_id = fields.Many2one(
         "res.partner",
         string="Carrier",
diff --git a/l10n_it_delivery_note/models/stock_picking.py b/l10n_it_delivery_note/models/stock_picking.py
index f26afc21f726..7dafcd39162d 100644
--- a/l10n_it_delivery_note/models/stock_picking.py
+++ b/l10n_it_delivery_note/models/stock_picking.py
@@ -32,6 +32,7 @@ class StockPicking(models.Model):
     delivery_note_partner_shipping_id = fields.Many2one(
         "res.partner", related="delivery_note_id.partner_shipping_id"
     )
+    delivery_note_customer_id = fields.Many2one(related="delivery_note_id.customer_id")
 
     delivery_note_carrier_id = fields.Many2one(
         "res.partner", string="DN Carrier", related="delivery_note_id.carrier_id"
@@ -347,12 +348,14 @@ def _create_delivery_note(self):
             limit=1,
         )
         delivery_method_id = self.mapped("carrier_id")[:1]
+        partner_id = partners[2].id if self.sale_id else partners[0].id
         return self.env["stock.delivery.note"].create(
             {
                 "company_id": self.company_id.id,
                 "partner_sender_id": partners[0].id,
-                "partner_id": partners[2].id if self.sale_id else partners[0].id,
+                "partner_id": partner_id.id,
                 "partner_shipping_id": partners[1].id,
+                "customer_id": partner_id.id if self.sale_id else partners[1].id,
                 "type_id": type_id.id,
                 "date": self.date_done,
                 "carrier_id": delivery_method_id.partner_id.id,
diff --git a/l10n_it_delivery_note/report/report_delivery_note.xml b/l10n_it_delivery_note/report/report_delivery_note.xml
index fe7d7b385597..a2fea9fcbedb 100644
--- a/l10n_it_delivery_note/report/report_delivery_note.xml
+++ b/l10n_it_delivery_note/report/report_delivery_note.xml
@@ -38,12 +38,12 @@
                     </t>
                     <t t-else="">
                         <div
-                            t-field="doc.partner_id"
+                            t-field="doc.customer_id"
                             t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
                         />
-                        <p t-if="doc.partner_id.vat"><t
+                        <p t-if="doc.customer_id.vat"><t
                                 t-esc="doc.company_id.country_id.vat_label or 'Tax ID'"
-                            />: <span t-field="doc.partner_id.vat" /></p>
+                            />: <span t-field="doc.customer_id.vat" /></p>
                     </t>
                 </t>
             </t>
diff --git a/l10n_it_delivery_note/views/stock_picking.xml b/l10n_it_delivery_note/views/stock_picking.xml
index 7ba5fdc66eca..7550d3f48328 100644
--- a/l10n_it_delivery_note/views/stock_picking.xml
+++ b/l10n_it_delivery_note/views/stock_picking.xml
@@ -207,13 +207,8 @@
                                                     'readonly': [('delivery_note_readonly', '=', True)]}"
                                     />
                                     <field
-                                        name="delivery_note_carrier_id"
-                                        attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
-                                        string="Carrier"
-                                    />
-                                    <field
-                                        name="delivery_method_id"
-                                        attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
+                                        name="delivery_note_date"
+                                        attrs="{'readonly': [('delivery_note_draft', '=', False)]}"
                                     />
                                 </group>
                                 <group>
@@ -223,9 +218,10 @@
                                         attrs="{'required': [('delivery_note_exists', '=', True)],
                                                     'readonly': [('delivery_note_draft', '=', False)]}"
                                     />
+                                    <field name="sale_id" invisible="1" />
                                     <field
-                                        name="delivery_note_date"
-                                        attrs="{'readonly': [('delivery_note_draft', '=', False)]}"
+                                        name="delivery_note_customer_id"
+                                        attrs="{'readonly': [('sale_id', '=', False)]}"
                                     />
                                     <label for="transport_datetime" />
                                     <div class="o_row">
@@ -249,6 +245,11 @@
                                 attrs="{'invisible': [('delivery_note_exists', '=', False)]}"
                             >
                                 <group>
+                                    <field
+                                        name="delivery_note_carrier_id"
+                                        attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
+                                        string="Carrier"
+                                    />
                                     <field
                                         name="packages"
                                         attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
@@ -269,6 +270,10 @@
                                     </div>
                                 </group>
                                 <group>
+                                    <field
+                                        name="delivery_method_id"
+                                        attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
+                                    />
                                     <label for="gross_weight" />
                                     <div class="o_row">
                                         <field
diff --git a/l10n_it_delivery_note/wizard/delivery_note_create.py b/l10n_it_delivery_note/wizard/delivery_note_create.py
index 4afb99abef1e..00605228c0ef 100644
--- a/l10n_it_delivery_note/wizard/delivery_note_create.py
+++ b/l10n_it_delivery_note/wizard/delivery_note_create.py
@@ -31,6 +31,8 @@ def _default_type(self):
                 [("code", "=", "outgoing")], limit=1
             )
 
+    partner_shipping_id = fields.Many2one("res.partner", required=True)
+
     date = fields.Date(default=_default_date)
     type_id = fields.Many2one(
         "stock.delivery.note.type", default=_default_type, required=True
@@ -76,17 +78,23 @@ def _onchange_partner(self):
 
     def _prepare_delivery_note_vals(self, sale_order_id):
         delivery_method_id = self.selected_picking_ids.mapped("carrier_id")[:1]
+
+        partner_id = (
+            sale_order_id.partner_invoice_id.id
+            if sale_order_id.partner_invoice_id
+            else self.partner_id.id
+        )
+
         return {
             "company_id": (
                 self.selected_picking_ids.mapped("company_id")[:1].id or False
             ),
             "partner_sender_id": self.partner_sender_id.id,
-            "partner_id": (
-                sale_order_id.partner_invoice_id.id
-                if sale_order_id.partner_invoice_id
-                else self.partner_id.id
-            ),
+            "partner_id": partner_id.id,
             "partner_shipping_id": self.partner_shipping_id.id,
+            "customer_id": partner_id.id
+            if self.selected_picking_ids.mapped("sale_id")
+            else self.partner_shipping_id.id,
             "type_id": self.type_id.id,
             "date": self.date,
             "carrier_id": delivery_method_id.partner_id.id,