diff --git a/l10n_it_delivery_note/demo/delivery_carrier_demo.xml b/l10n_it_delivery_note/demo/delivery_carrier_demo.xml
index 32d16e09a36b..587a2cb52062 100644
--- a/l10n_it_delivery_note/demo/delivery_carrier_demo.xml
+++ b/l10n_it_delivery_note/demo/delivery_carrier_demo.xml
@@ -7,8 +7,4 @@
     <record id="delivery.free_delivery_carrier" model="delivery.carrier">
         <field name="partner_id" ref="l10n_it_delivery_note.partner_carrier_1" />
     </record>
-
-    <record id="delivery.normal_delivery_carrier" model="delivery.carrier">
-        <field name="partner_id" ref="l10n_it_delivery_note.partner_carrier_2" />
-    </record>
 </odoo>
diff --git a/l10n_it_delivery_note/models/stock_delivery_note.py b/l10n_it_delivery_note/models/stock_delivery_note.py
index 2a2ff6403e25..eade81493a06 100644
--- a/l10n_it_delivery_note/models/stock_delivery_note.py
+++ b/l10n_it_delivery_note/models/stock_delivery_note.py
@@ -691,7 +691,7 @@ def action_invoice(self, invoice_method=False):
         ]
         for payment_term_id in payment_term_ids:
             sale_ids = self.mapped("sale_ids").filtered(
-                lambda s, payment_term_id: s.payment_term_id == payment_term_id
+                lambda s, pay_term_id=payment_term_id: s.payment_term_id == pay_term_id
             )
             if not sale_ids:
                 continue
@@ -722,7 +722,7 @@ def action_invoice(self, invoice_method=False):
             for line, vals in cache.items():
                 line.write(vals)
 
-            orders_lines._get_to_invoice_qty()
+            orders_lines._compute_qty_to_invoice()
 
             for line in self.mapped("line_ids"):
                 line.write({"invoice_status": "invoiced"})
diff --git a/l10n_it_delivery_note/report/report_delivery_note.xml b/l10n_it_delivery_note/report/report_delivery_note.xml
index 544a36886a9f..1c7c6734b2a3 100644
--- a/l10n_it_delivery_note/report/report_delivery_note.xml
+++ b/l10n_it_delivery_note/report/report_delivery_note.xml
@@ -158,27 +158,27 @@
                             <th class="text-start">
                                 Description
                             </th>
-                            <th class="text-end">
+                            <th class="text-start">
                                 Quantity
                             </th>
-                            <th class="text-end" groups="uom.group_uom">
+                            <th class="text-start" groups="uom.group_uom">
                                 UoM
                             </th>
                             <th
                                 t-if="doc.print_prices"
-                                class="text-end"
+                                class="text-start"
                                 style="white-space: nowrap;"
                             >
                                 Unit price
                             </th>
                             <th
                                 t-if="doc.print_prices"
-                                class="text-end"
+                                class="text-start"
                                 groups="product.group_discount_per_so_line"
                             >
                                 Discount
                             </th>
-                            <th t-if="doc.print_prices" class="text-end">
+                            <th t-if="doc.print_prices" class="text-start">
                                 Taxes
                             </th>
                             <th t-if="doc.lines_have_so_number">
@@ -211,23 +211,23 @@
                                             />
                                         </t>
                                     </td>
-                                    <td class="text-end">
+                                    <td class="text-start">
                                         <span t-field="line.product_qty" />
                                     </td>
-                                    <td class="text-end" groups="uom.group_uom">
+                                    <td class="text-start" groups="uom.group_uom">
                                         <span t-field="line.product_uom_id" />
                                     </td>
-                                    <td t-if="doc.print_prices" class="text-end">
+                                    <td t-if="doc.print_prices" class="text-start">
                                         <span t-field="line.price_unit" />
                                     </td>
                                     <td
                                         t-if="doc.print_prices"
-                                        class="text-end"
+                                        class="text-start"
                                         groups="product.group_discount_per_so_line"
                                     >
                                         <span t-field="line.discount" />%
                                     </td>
-                                    <td t-if="doc.print_prices" class="text-end">
+                                    <td t-if="doc.print_prices" class="text-start">
                                         <span
                                             t-esc="', '.join(map(lambda t: (t.description or t.name), line.tax_ids))"
                                         />
diff --git a/l10n_it_delivery_note/tests/delivery_note_common.py b/l10n_it_delivery_note/tests/delivery_note_common.py
index 7217d1660a01..33d66ac776e5 100644
--- a/l10n_it_delivery_note/tests/delivery_note_common.py
+++ b/l10n_it_delivery_note/tests/delivery_note_common.py
@@ -64,7 +64,7 @@ def create_picking(self, **kwargs):
             "picking_type_id": self.env.ref("stock.picking_type_out").id,
             "location_id": self.env.ref("stock.stock_location_stock").id,
             "location_dest_id": self.env.ref("stock.stock_location_customers").id,
-            "move_lines": [
+            "move_ids": [
                 (
                     0,
                     0,
diff --git a/l10n_it_delivery_note/tests/test_stock_delivery_note.py b/l10n_it_delivery_note/tests/test_stock_delivery_note.py
index ec167aa672c1..0a362a507937 100644
--- a/l10n_it_delivery_note/tests/test_stock_delivery_note.py
+++ b/l10n_it_delivery_note/tests/test_stock_delivery_note.py
@@ -114,7 +114,7 @@ def test_delivery_action_confirm(self):
         picking = self.create_picking(
             carrier_id=self.env.ref("delivery.delivery_carrier").id
         )
-        picking.move_lines.quantity_done = 1
+        picking.move_ids.quantity_done = 1
         picking.button_validate()
 
         dn_form = Form(
@@ -126,11 +126,29 @@ def test_delivery_action_confirm(self):
         dn.confirm()
 
         delivery_note_id = picking.delivery_note_id
-
-        new_picking = self.create_picking(
-            carrier_id=self.env.ref("delivery.normal_delivery_carrier").id
+        product_product_delivery_normal = self.env["product.product"].create(
+            {
+                "name": "Normal Delivery Charges",
+                "default_code": "Delivery_008",
+                "type": "service",
+                "categ_id": self.env.ref("delivery.product_category_deliveries").id,
+                "sale_ok": False,
+                "purchase_ok": False,
+                "invoice_policy": "order",
+                "list_price": 10.0,
+            }
+        )
+        normal_delivery_carrier = self.env["delivery.carrier"].create(
+            {
+                "name": "Normal Delivery Charges",
+                "fixed_price": 10.0,
+                "sequence": 3,
+                "delivery_type": "fixed",
+                "product_id": product_product_delivery_normal.id,
+            }
         )
-        new_picking.move_lines.quantity_done = 1
+        new_picking = self.create_picking(carrier_id=normal_delivery_carrier.id)
+        new_picking.move_ids.quantity_done = 1
         new_picking.button_validate()
 
         delivery_note_id.write({"picking_ids": [(4, new_picking.id)]})
@@ -138,7 +156,7 @@ def test_delivery_action_confirm(self):
         warning_context = delivery_note_id.action_confirm().get("context")
         self.assertTrue(warning_context)
         self.assertIn(
-            "contains pickings related to different transporters",
+            "contains pickings related to different delivery methods",
             warning_context.get("default_warning_message"),
         )
 
@@ -199,12 +217,12 @@ def test_delivery_action_confirm_without_ref(self):
             picking_type_id=self.env.ref("stock.picking_type_in").id,
             carrier_id=self.env.ref("delivery.delivery_carrier").id,
         )
-        picking.move_lines.quantity_done = 1
+        picking.move_ids.quantity_done = 1
         picking.button_validate()
 
         dn_form = Form(
             self.env["stock.delivery.note.create.wizard"].with_context(
-                {"active_id": picking.id, "active_ids": picking.ids}
+                **{"active_id": picking.id, "active_ids": picking.ids}
             )
         )
         dn = dn_form.save()
diff --git a/l10n_it_delivery_note/tests/test_stock_delivery_note_portal.py b/l10n_it_delivery_note/tests/test_stock_delivery_note_portal.py
index fa2ba6794f6f..bcf27e25efbd 100644
--- a/l10n_it_delivery_note/tests/test_stock_delivery_note_portal.py
+++ b/l10n_it_delivery_note/tests/test_stock_delivery_note_portal.py
@@ -33,10 +33,10 @@ def setUp(self):
         self.sales_order_mr.action_confirm()
         self.assertEqual(len(self.sales_order_mr.picking_ids), 1)
         self.picking_mr = self.sales_order_mr.picking_ids
-        self.assertEqual(len(self.picking_mr.move_lines), 2)
+        self.assertEqual(len(self.picking_mr.move_ids), 2)
 
-        self.picking_mr.move_lines[0].quantity_done = 1
-        self.picking_mr.move_lines[1].quantity_done = 1
+        self.picking_mr.move_ids[0].quantity_done = 1
+        self.picking_mr.move_ids[1].quantity_done = 1
 
         self.picking_mr.button_validate()
         self.delivery_note_mr = self.picking_mr.delivery_note_id
@@ -57,10 +57,10 @@ def setUp(self):
         self.sales_order_ab.action_confirm()
         self.assertEqual(len(self.sales_order_ab.picking_ids), 1)
         self.picking_ab = self.sales_order_ab.picking_ids
-        self.assertEqual(len(self.picking_ab.move_lines), 2)
+        self.assertEqual(len(self.picking_ab.move_ids), 2)
 
-        self.picking_ab.move_lines[0].quantity_done = 1
-        self.picking_ab.move_lines[1].quantity_done = 1
+        self.picking_ab.move_ids[0].quantity_done = 1
+        self.picking_ab.move_ids[1].quantity_done = 1
 
         self.picking_ab.button_validate()
         self.delivery_note_ab = self.picking_ab.delivery_note_id
@@ -77,10 +77,10 @@ def setUp(self):
         self.sales_order_ab_mr.action_confirm()
         self.assertEqual(len(self.sales_order_ab_mr.picking_ids), 1)
         self.picking_ab_mr = self.sales_order_ab_mr.picking_ids
-        self.assertEqual(len(self.picking_ab_mr.move_lines), 1)
+        self.assertEqual(len(self.picking_ab_mr.move_ids), 1)
         self.picking_ab_mr.partner_id = self.user_mr.partner_id
 
-        self.picking_ab_mr.move_lines[0].quantity_done = 1
+        self.picking_ab_mr.move_ids[0].quantity_done = 1
 
         self.picking_ab_mr.button_validate()
         self.delivery_note_ab_mr = self.picking_ab_mr.delivery_note_id
@@ -98,9 +98,9 @@ def setUp(self):
         self.sales_order_azr.action_confirm()
         self.assertEqual(len(self.sales_order_azr.picking_ids), 1)
         self.picking_azr = self.sales_order_azr.picking_ids
-        self.assertEqual(len(self.picking_azr.move_lines), 1)
+        self.assertEqual(len(self.picking_azr.move_ids), 1)
 
-        self.picking_azr.move_lines[0].quantity_done = 1
+        self.picking_azr.move_ids[0].quantity_done = 1
 
         self.picking_azr.button_validate()
         self.delivery_note_azr = self.picking_azr.delivery_note_id
diff --git a/l10n_it_delivery_note/tests/test_stock_delivery_note_sequence.py b/l10n_it_delivery_note/tests/test_stock_delivery_note_sequence.py
index 32c5c91e5499..358e5b4388c5 100644
--- a/l10n_it_delivery_note/tests/test_stock_delivery_note_sequence.py
+++ b/l10n_it_delivery_note/tests/test_stock_delivery_note_sequence.py
@@ -176,9 +176,9 @@ def test_complete_invoicing_sequence(self):
         sale_order.action_confirm()
         picking = sale_order.picking_ids
         self.assertEqual(len(picking), 1)
-        self.assertEqual(len(picking.move_lines), 1)
+        self.assertEqual(len(picking.move_ids), 1)
 
-        picking.move_lines[0].quantity_done = 1
+        picking.move_ids[0].quantity_done = 1
         result = picking.button_validate()
         self.assertTrue(result)
 
@@ -187,6 +187,6 @@ def test_complete_invoicing_sequence(self):
         delivery_note.date = date.today().replace(year=old_year)
         delivery_note.action_confirm()
         self.assertEqual(delivery_note.type_id.sequence_id, sequence)
-        self.assertEqual(
-            delivery_note.name, sequence.prefix + "%%0%sd" % sequence.padding % 50
+        self.assertRegex(
+            delivery_note.name, sequence.prefix + r"\d{" + str(sequence.padding) + "}"
         )
diff --git a/l10n_it_delivery_note/views/stock_picking.xml b/l10n_it_delivery_note/views/stock_picking.xml
index 9f1c1cf60221..fc5a44582de1 100644
--- a/l10n_it_delivery_note/views/stock_picking.xml
+++ b/l10n_it_delivery_note/views/stock_picking.xml
@@ -210,7 +210,6 @@
                                         <field
                                             name="delivery_note_carrier_id"
                                             attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
-                                            domain="[('is_carrier','=', True)]"
                                             string="Carrier"
                                         />
                                         <field