diff --git a/l10n_br_delivery/__manifest__.py b/l10n_br_delivery/__manifest__.py
index e688e1705d9e..ba37d75978a6 100644
--- a/l10n_br_delivery/__manifest__.py
+++ b/l10n_br_delivery/__manifest__.py
@@ -7,7 +7,7 @@
     "author": "Akretion, Odoo Community Association (OCA)",
     "maintainers": ["renatonlima", "mbcosta"],
     "website": "https://github.com/OCA/l10n-brazil",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "development_status": "Beta",
     "depends": [
         "l10n_br_sale_stock",
diff --git a/l10n_br_delivery/demo/l10n_br_delivery_demo.xml b/l10n_br_delivery/demo/l10n_br_delivery_demo.xml
index d943aa94a813..cdb3d573b569 100644
--- a/l10n_br_delivery/demo/l10n_br_delivery_demo.xml
+++ b/l10n_br_delivery/demo/l10n_br_delivery_demo.xml
@@ -67,7 +67,7 @@
         <field name="fixed_price">10.0</field>
         <field name="sequence">3</field>
         <field name="delivery_type">fixed</field>
-        <field name="product_id" ref="delivery.product_product_delivery_normal" />
+        <field name="product_id" ref="delivery.product_product_local_delivery" />
         <field name="partner_id" ref="test_carrier" />
         <field name="antt_code">Teste - Código ANTT</field>
         <field
@@ -78,35 +78,26 @@
         />
     </record>
 
-    <!-- Resource: stock.inventory -->
+    <!-- Resource: stock.quant -->
 
-    <record id="l10n_br_delivery_stock_inventory_0" model="stock.inventory">
-        <field name="name">Starting Inventory - l10n_br_delivery</field>
-        <field name="state">confirm</field>
-    </record>
-
-    <!-- Resource: stock.inventory.line -->
-
-    <record id="l10n_br_delivery_stock_inventory_line_1" model="stock.inventory.line">
+    <record id="l10n_br_delivery_stock_quant_1" model="stock.quant">
         <field name="product_id" ref="product.product_delivery_01" />
-        <field name="product_uom_id" ref="uom.product_uom_unit" />
-        <field name="inventory_id" ref="l10n_br_delivery_stock_inventory_0" />
-        <field name="product_qty">100</field>
+        <field name="inventory_quantity">100</field>
         <field name="location_id" ref="stock.stock_location_stock" />
     </record>
 
-    <record id="l10n_br_delivery_stock_inventory_line_2" model="stock.inventory.line">
+    <record id="l10n_br_delivery_stock_quant_2" model="stock.quant">
         <field name="product_id" ref="product.product_delivery_02" />
-        <field name="product_uom_id" ref="uom.product_uom_unit" />
-        <field name="inventory_id" ref="l10n_br_delivery_stock_inventory_0" />
-        <field name="product_qty">100</field>
+        <field name="inventory_quantity">100</field>
         <field name="location_id" ref="stock.stock_location_stock" />
     </record>
 
-    <function model="stock.inventory" name="action_validate">
-        <function
-            eval="[[('state','=','draft'),('id', '=', ref('l10n_br_delivery_stock_inventory_0'))]]"
-            model="stock.inventory"
+    <function model="stock.quant" name="action_apply_inventory">
+            <function
+            eval="[[('id', 'in', (ref('l10n_br_delivery_stock_quant_1'),
+                                            ref('l10n_br_delivery_stock_quant_2'),
+                                            ))]]"
+            model="stock.quant"
             name="search"
         />
     </function>
diff --git a/l10n_br_delivery/models/vehicle.py b/l10n_br_delivery/models/vehicle.py
index e5a39d819fa8..170904fcbb28 100644
--- a/l10n_br_delivery/models/vehicle.py
+++ b/l10n_br_delivery/models/vehicle.py
@@ -8,10 +8,15 @@ class CarrierVehicle(models.Model):
     _name = "l10n_br_delivery.carrier.vehicle"
     _description = "Carrier Vehicle"
 
-    name = fields.Char(required=True, size=32)
+    name = fields.Char(
+        required=True,
+        size=32,
+        unaccent=False,
+    )
 
     description = fields.Char(
         size=132,
+        unaccent=False,
     )
 
     plate = fields.Char(
@@ -21,6 +26,7 @@ class CarrierVehicle(models.Model):
 
     driver = fields.Char(
         size=64,
+        unaccent=False,
     )
 
     rntc_code = fields.Char(
diff --git a/l10n_br_delivery/tests/test_delivery_inverse_amount.py b/l10n_br_delivery/tests/test_delivery_inverse_amount.py
index a4f62534130e..5c1bed65b50a 100644
--- a/l10n_br_delivery/tests/test_delivery_inverse_amount.py
+++ b/l10n_br_delivery/tests/test_delivery_inverse_amount.py
@@ -37,6 +37,7 @@ def setUpClass(cls):
 
         # Alteração para permitir do teste
         cls.sale_order_line_id.company_id.delivery_costs = "total"
+        cls.sale_order_line_id.company_id.sale_create_invoice_policy = "sale_order"
         # Change freight, insurance and other costs amount by Total values
         with Form(cls.sale_order_total_id) as so:
             so.amount_freight_value = 100.0
@@ -110,9 +111,11 @@ def test_sale_order_total_amounts(self):
             110.0,
             "Unexpected value for the field amount_price_gross from Sale Order",
         )
+        # No amount_untaxed é esperado o valor total dos produtos + frete, seguro
+        # e outros.
         self.assertEqual(
             self.sale_order_total_id.amount_untaxed,
-            110.0,
+            410.0,
             "Unexpected value for the field amount_untaxed from Sale Order",
         )
         self.assertEqual(
@@ -143,9 +146,11 @@ def test_sale_order_line_amounts(self):
             110.0,
             "Unexpected value for the field amount_price_gross from Sale Order",
         )
+        # No amount_untaxed é esperado o valor total dos produtos + frete, seguro
+        # e outros.
         self.assertEqual(
             self.sale_order_line_id.amount_untaxed,
-            110.0,
+            410.0,
             "Unexpected value for the field amount_untaxed from Sale Order",
         )
         self.assertEqual(
diff --git a/l10n_br_delivery/views/l10n_br_delivery_view.xml b/l10n_br_delivery/views/l10n_br_delivery_view.xml
index 9beaf6d9de95..a519ef7cc910 100644
--- a/l10n_br_delivery/views/l10n_br_delivery_view.xml
+++ b/l10n_br_delivery/views/l10n_br_delivery_view.xml
@@ -58,7 +58,7 @@
     <menuitem
         name="Vehicle"
         id="menu_l10n_br_delivery_carrier_vehicle_form"
-        parent="delivery.menu_delivery"
+        parent="stock.menu_delivery"
         action="action_l10n_br_delivery_carrier_vehicle_form"
         sequence="10"
     />