diff --git a/sale_stock_picking_invoicing/__manifest__.py b/sale_stock_picking_invoicing/__manifest__.py
index 495540eb2dd1..8a7b3267eca0 100644
--- a/sale_stock_picking_invoicing/__manifest__.py
+++ b/sale_stock_picking_invoicing/__manifest__.py
@@ -10,7 +10,7 @@
     "license": "AGPL-3",
     "author": "Akretion, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/account-invoicing",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "maintainers": ["mbcosta", "renatonlima"],
     "depends": [
         "sale_management",
diff --git a/sale_stock_picking_invoicing/tests/test_sale_stock.py b/sale_stock_picking_invoicing/tests/test_sale_stock.py
index 39838d4f8911..1aad801b364b 100644
--- a/sale_stock_picking_invoicing/tests/test_sale_stock.py
+++ b/sale_stock_picking_invoicing/tests/test_sale_stock.py
@@ -130,7 +130,7 @@ def test_01_sale_stock_return(self):
         stock_picking = self.so.picking_ids
 
         # compare sale.order.line with stock.move
-        stock_move = stock_picking.move_lines
+        stock_move = stock_picking.move_ids
         sale_order_line = self.so.order_line
 
         sm_fields = [key for key in self.env["stock.move"]._fields.keys()]
@@ -169,7 +169,7 @@ def test_picking_sale_order_product_and_service(self):
             "sale_stock_picking_invoicing.main_company-sale_order_2"
         )
         # Necessary to get the currency
-        sale_order_2.onchange_partner_id()
+        # sale_order_2.onchange_partner_id()
         sale_order_2.action_confirm()
         # Method to create invoice in sale order should work only
         # for lines where products are of TYPE Service
@@ -262,6 +262,9 @@ def test_picking_sale_order_product_and_service(self):
             "__last_update",
             # Field sequence add in creation of Invoice
             "sequence",
+            "currency_id",
+            "analytic_precision",
+            "display_type",
         ]
 
         common_fields = list(set(acl_fields) & set(sol_fields) - set(skipped_fields))
@@ -284,7 +287,7 @@ def test_picking_sale_order_product_and_service(self):
         picking_devolution = self.return_picking_wizard(picking)
 
         self.assertEqual(picking_devolution.invoice_state, "2binvoiced")
-        for line in picking_devolution.move_lines:
+        for line in picking_devolution.move_ids:
             self.assertEqual(line.invoice_state, "2binvoiced")
 
         self.picking_move_state(picking_devolution)
diff --git a/sale_stock_picking_invoicing/wizards/stock_invoice_onshipping.py b/sale_stock_picking_invoicing/wizards/stock_invoice_onshipping.py
index 6b759099dcb1..133244166056 100644
--- a/sale_stock_picking_invoicing/wizards/stock_invoice_onshipping.py
+++ b/sale_stock_picking_invoicing/wizards/stock_invoice_onshipping.py
@@ -160,12 +160,12 @@ def _get_invoice_line_values(self, moves, invoice_values, invoice):
         if move.sale_line_id:
             # Vals informed in any case
             values["sale_line_ids"] = [(6, 0, moves.sale_line_id.ids)]
-            values[
-                "analytic_account_id"
-            ] = moves.sale_line_id.order_id.analytic_account_id.id
-            values["analytic_tag_ids"] = [
-                (6, 0, moves.sale_line_id.analytic_tag_ids.ids)
-            ]
+            # values[
+            #    "analytic_account_id"
+            # ] = moves.sale_line_id.order_id.analytic_account_id.id
+            # values["analytic_tag_ids"] = [
+            #    (6, 0, moves.sale_line_id.analytic_tag_ids.ids)
+            # ]
             # Refund case don't get values from Sale Line Dict
             # TODO: Should get any value?
             if self._get_invoice_type() != "out_refund":
@@ -178,7 +178,6 @@ def _get_invoice_line_values(self, moves, invoice_values, invoice):
 
                 # Fields to remove
                 vals_to_remove = {
-                    "display_type",
                     "name",
                     "product_id",
                     "product_uom_id",
@@ -191,6 +190,8 @@ def _get_invoice_line_values(self, moves, invoice_values, invoice):
                     # another fields
                     "__last_update",
                     "display_name",
+                    "currency_id",
+                    "analytic_precision",
                 }
                 sale_line_values_rm = {
                     k: sale_line_values[k]