diff --git a/account_invoice_start_end_dates/__manifest__.py b/account_invoice_start_end_dates/__manifest__.py
index 2bbdb016afb..5606f215586 100644
--- a/account_invoice_start_end_dates/__manifest__.py
+++ b/account_invoice_start_end_dates/__manifest__.py
@@ -5,7 +5,7 @@
 
 {
     "name": "Account Invoice Start End Dates",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Accounting & Finance",
     "license": "AGPL-3",
     "summary": "Adds start/end dates on invoice/move lines",
diff --git a/account_invoice_start_end_dates/tests/test_invoice_start_end_dates.py b/account_invoice_start_end_dates/tests/test_invoice_start_end_dates.py
index 4dfead937c3..f143df56ea8 100644
--- a/account_invoice_start_end_dates/tests/test_invoice_start_end_dates.py
+++ b/account_invoice_start_end_dates/tests/test_invoice_start_end_dates.py
@@ -16,19 +16,14 @@ def setUpClass(cls):
         cls.move_model = cls.env["account.move"]
         cls.account_model = cls.env["account.account"]
         cls.journal_model = cls.env["account.journal"]
-        cls.account_revenue = cls.account_model.search(
-            [
-                (
-                    "user_type_id",
-                    "=",
-                    cls.env.ref("account.data_account_type_revenue").id,
-                )
-            ],
-            limit=1,
+        cls.account_revenue = cls.env["account.chart.template"]._get_demo_account(
+            "income",
+            "income",
+            cls.env.company,
         )
         cls.sale_journal = cls.journal_model.search([("type", "=", "sale")], limit=1)
         cls.maint_product = cls.env.ref(
-            "account_invoice_start_end_dates." "product_maintenance_contract_demo"
+            "account_invoice_start_end_dates.product_maintenance_contract_demo"
         )
 
     def _date(self, date):
diff --git a/account_invoice_start_end_dates/views/account_move.xml b/account_invoice_start_end_dates/views/account_move.xml
index 5980798b0cd..ae8dcc1891d 100644
--- a/account_invoice_start_end_dates/views/account_move.xml
+++ b/account_invoice_start_end_dates/views/account_move.xml
@@ -45,7 +45,7 @@
                 />
             </xpath>
             <xpath
-                expr="//field[@name='invoice_line_ids']/form//field[@name='analytic_tag_ids']"
+                expr="//field[@name='invoice_line_ids']/form//field[@name='quantity']"
                 position="before"
             >
                 <field name="must_have_dates" invisible="1" />