diff --git a/contract_invoice_start_end_dates/__init__.py b/contract_invoice_start_end_dates/__init__.py
index 0f9fbab01..0650744f6 100644
--- a/contract_invoice_start_end_dates/__init__.py
+++ b/contract_invoice_start_end_dates/__init__.py
@@ -1,3 +1 @@
-# -*- coding: utf-8 -*-
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 from . import models
diff --git a/contract_invoice_start_end_dates/__manifest__.py b/contract_invoice_start_end_dates/__manifest__.py
index 40f46108c..6a94c162f 100644
--- a/contract_invoice_start_end_dates/__manifest__.py
+++ b/contract_invoice_start_end_dates/__manifest__.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# Copyright 2019 Akretion
+# Copyright 2019-2020 Akretion France (http://www.akretion.com/)
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
 
 {
@@ -8,13 +7,13 @@
     'category': 'Contract Management',
     'author': 'Akretion, '
               'Odoo Community Association (OCA)',
+    'maintainers': ['florian-dacosta'],
     'website': 'https://github.com/OCA/contract',
     'depends': [
         'account_invoice_start_end_dates',
         'contract',
     ],
-    'data': [
-    ],
+    'data': [],
     'license': 'AGPL-3',
     'installable': True,
 }
diff --git a/contract_invoice_start_end_dates/models/__init__.py b/contract_invoice_start_end_dates/models/__init__.py
index f20c3dcc4..6143a3650 100644
--- a/contract_invoice_start_end_dates/models/__init__.py
+++ b/contract_invoice_start_end_dates/models/__init__.py
@@ -1,3 +1 @@
-# -*- coding: utf-8 -*-
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
-from . import account_analytic_account
+from . import contract_line
diff --git a/contract_invoice_start_end_dates/models/account_analytic_account.py b/contract_invoice_start_end_dates/models/account_analytic_account.py
deleted file mode 100644
index 060bff603..000000000
--- a/contract_invoice_start_end_dates/models/account_analytic_account.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2019 - Akretion
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import api, models
-
-
-class AccountAnalyticAccount(models.Model):
-    _inherit = 'account.analytic.account'
-
-    @api.model
-    def _prepare_invoice_line(self, line, invoice_id):
-        vals = super(AccountAnalyticAccount, self)._prepare_invoice_line(
-            line, invoice_id)
-        if line.product_id.must_have_dates:
-            vals.update({
-                'start_date': self.env.context['date_from'],
-                'end_date': self.env.context['date_to'],
-            })
-        return vals
diff --git a/contract_invoice_start_end_dates/models/contract_line.py b/contract_invoice_start_end_dates/models/contract_line.py
new file mode 100644
index 000000000..361d9ba64
--- /dev/null
+++ b/contract_invoice_start_end_dates/models/contract_line.py
@@ -0,0 +1,20 @@
+# Copyright 2019-2020 Akretion France (http://www.akretion.com/)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class ContractLine(models.Model):
+    _inherit = 'contract.line'
+
+    def _prepare_invoice_line(self, invoice_id=False, invoice_values=False):
+        vals = super(ContractLine, self)._prepare_invoice_line(
+            invoice_id=invoice_id, invoice_values=invoice_values)
+        if self.product_id.must_have_dates:
+            dates = self._get_period_to_invoice(
+                self.last_date_invoiced, self.recurring_next_date)
+            vals.update({
+                'start_date': dates[0],
+                'end_date': dates[1],
+            })
+        return vals
diff --git a/contract_invoice_start_end_dates/readme/DESCRIPTION.rst b/contract_invoice_start_end_dates/readme/DESCRIPTION.rst
index feb5f9c7e..0dfd06b2d 100644
--- a/contract_invoice_start_end_dates/readme/DESCRIPTION.rst
+++ b/contract_invoice_start_end_dates/readme/DESCRIPTION.rst
@@ -1,2 +1,2 @@
 This module automatically adds start and end dates to the invoice line
-generated by a contract if the product is marked as 'must have date'.
+generated by a contract if the product is marked as *Must have dates*.