diff --git a/contract/__manifest__.py b/contract/__manifest__.py
index 3b62b874c..1f869ceaf 100644
--- a/contract/__manifest__.py
+++ b/contract/__manifest__.py
@@ -9,7 +9,7 @@
 
 {
     'name': 'Recurring - Contracts Management',
-    'version': '12.0.7.0.0',
+    'version': '12.0.7.1.0',
     'category': 'Contract Management',
     'license': 'AGPL-3',
     'author': "OpenERP SA, "
diff --git a/contract/i18n/am.po b/contract/i18n/am.po
index 70087bf63..4fae3e7d8 100644
--- a/contract/i18n/am.po
+++ b/contract/i18n/am.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "Creado en"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/ar.po b/contract/i18n/ar.po
index 72e30cbd4..95baff2c3 100644
--- a/contract/i18n/ar.po
+++ b/contract/i18n/ar.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "أنشئ في"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/bg.po b/contract/i18n/bg.po
index 3eee1c6d6..dee9ca893 100644
--- a/contract/i18n/bg.po
+++ b/contract/i18n/bg.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "Създадено на"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1467,7 +1492,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1478,7 +1503,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1533,7 +1558,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1622,7 +1647,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1702,6 +1727,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1718,19 +1757,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1738,7 +1777,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1746,7 +1785,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1754,7 +1793,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1762,7 +1801,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/bs.po b/contract/i18n/bs.po
index fe540cb12..7dfbe9972 100644
--- a/contract/i18n/bs.po
+++ b/contract/i18n/bs.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Kreirano"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1140,6 +1158,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1218,7 +1243,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1229,7 +1254,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1464,7 +1489,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1475,7 +1500,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1530,7 +1555,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1619,7 +1644,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1699,6 +1724,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1715,19 +1754,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1735,7 +1774,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1743,7 +1782,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1751,7 +1790,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1759,7 +1798,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/ca.po b/contract/i18n/ca.po
index d91a0d781..244d507bd 100644
--- a/contract/i18n/ca.po
+++ b/contract/i18n/ca.po
@@ -259,19 +259,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Preu unitari</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr "Una línia de contracte cancel·lat no es pot activar per auto-renovar"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -326,7 +326,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -418,7 +418,7 @@ msgid "Cancel allowed?"
 msgstr "Es permet cancel·lar?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -469,7 +469,7 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "Redacta Email"
@@ -608,38 +608,38 @@ msgid "Contract Type"
 msgstr "Tipus de Contracte"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 "Línia de Contracte '%s' la data d'inici no pot ser posterior a la data de fi"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -649,7 +649,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -661,7 +661,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -673,7 +673,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -685,7 +685,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr "La línia de Contracte ha de ser cancel·lada abans d'esborrar-la"
@@ -696,7 +696,7 @@ msgid "Contract lines"
 msgstr "Línies de Contracte"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -786,6 +786,15 @@ msgstr "Creat el"
 msgid "Currency"
 msgstr "Moneda"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+#, fuzzy
+#| msgid "Customer"
+msgid "Custom"
+msgstr "Client"
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -838,6 +847,17 @@ msgstr "Data de Propera Factura"
 msgid "Day(s)"
 msgstr "Dia(es)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -854,7 +874,7 @@ msgid "Discount (%)"
 msgstr "Descompte (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "El descompte ha de ser inferior o igual a 100"
@@ -1246,6 +1266,15 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Note Invoicing Mode"
+msgstr "Tipus de Facturació"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1324,7 +1353,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1335,7 +1364,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Si us plau estableixi un %s diari per a l'empresa '%s'."
@@ -1572,7 +1601,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1583,7 +1612,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1638,7 +1667,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1730,7 +1759,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1810,6 +1839,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr "Setmana(es)"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1826,19 +1869,19 @@ msgid "Year(s)"
 msgstr "Any(s)"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1846,7 +1889,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1854,7 +1897,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1862,7 +1905,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1870,7 +1913,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/contract.pot b/contract/i18n/contract.pot
index e3c6bd757..5d937254c 100644
--- a/contract/i18n/contract.pot
+++ b/contract/i18n/contract.pot
@@ -167,19 +167,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -234,7 +234,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -318,7 +318,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -367,7 +367,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -494,37 +494,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid "Contract line for <strong>{product}</strong>\n"
 "                            stopped: <br/>\n"
@@ -533,7 +533,7 @@ msgid "Contract line for <strong>{product}</strong>\n"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid "Contract line for <strong>{product}</strong>\n"
 "                    planned a successor: <br/>\n"
@@ -544,7 +544,7 @@ msgid "Contract line for <strong>{product}</strong>\n"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid "Contract line for <strong>{product}</strong>\n"
 "                renewed: <br/>\n"
@@ -555,7 +555,7 @@ msgid "Contract line for <strong>{product}</strong>\n"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid "Contract line for <strong>{product}</strong>\n"
 "                suspended: <br/>\n"
@@ -566,7 +566,7 @@ msgid "Contract line for <strong>{product}</strong>\n"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -577,7 +577,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id=\"%s\">Invoice</a>"
 msgstr ""
@@ -660,6 +660,13 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -712,6 +719,16 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid "Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -728,7 +745,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1100,6 +1117,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1176,7 +1200,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1187,7 +1211,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1419,7 +1443,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1430,7 +1454,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1485,7 +1509,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1572,7 +1596,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1652,6 +1676,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1668,43 +1706,43 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid "You can't have a date of next invoice anterior to the start of the contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid "You can't have the end date before the date of last invoice for the contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid "You can't have the next invoice date before the date of last invoice for the contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid "You can't have the start date after the date of last invoice for the contract line '%s'"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/cs.po b/contract/i18n/cs.po
index a81fee494..213900786 100644
--- a/contract/i18n/cs.po
+++ b/contract/i18n/cs.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "Vytvořeno"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/da.po b/contract/i18n/da.po
index c03bb29a5..b2276ab68 100644
--- a/contract/i18n/da.po
+++ b/contract/i18n/da.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "Oprettet den"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/de.po b/contract/i18n/de.po
index d48fcd0b0..aac9cc5f2 100644
--- a/contract/i18n/de.po
+++ b/contract/i18n/de.po
@@ -257,14 +257,14 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Einzelpreis</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 "Eine stornierte Vertragsposition darf nicht auf auto-erneuern gesetzt werden"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
@@ -272,7 +272,7 @@ msgstr ""
 "werden"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr "Eine Vertragszeile mit einem Nachfolger muss ein Enddatum haben."
@@ -329,7 +329,7 @@ msgid "Add a section"
 msgstr "Unterteilung hinzufügen"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr "Eine auto-erneuern Position muss ein Enddatum besitzen"
@@ -413,7 +413,7 @@ msgid "Cancel allowed?"
 msgstr "Abbrechen erlaubt?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr "Das Abbrechen für diese Zeile ist nicht erlaubt."
@@ -462,7 +462,7 @@ msgid "Company"
 msgstr "Unternehmen"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "E-Mail verfassen"
@@ -599,37 +599,37 @@ msgid "Contract Type"
 msgstr "Vertragstyp"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr "Vertragsbeginn '%s' darf nicht nach dem Vertragsende liegen"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr "Vertragsposition Storno aufgehoben: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr "Die Vertragsposition und dessen Vorgänger überlappen sich."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr "Die Vertragsposition und dessen Nachfolger überlappen sich."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr "Die Vertragsposition wurde abgebrochen: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -643,7 +643,7 @@ msgstr ""
 "                            "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -661,7 +661,7 @@ msgstr ""
 "                    "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -679,7 +679,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -697,7 +697,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -709,14 +709,14 @@ msgid "Contract lines"
 msgstr "Vertragspositionen"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
 "\"%s\">Invoice</a>"
 msgstr ""
-"Vertrag manuell abgerechnet: <a href=\"#\" data-oe-model=\"%s\" data-oe-id=\""
-"%s\">Rechnung</a>"
+"Vertrag manuell abgerechnet: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
+"\"%s\">Rechnung</a>"
 
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_template__contract_line_ids
@@ -799,6 +799,15 @@ msgstr "Erstellt am"
 msgid "Currency"
 msgstr "Währung"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+#, fuzzy
+#| msgid "Customer"
+msgid "Custom"
+msgstr "Kunde"
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -851,6 +860,17 @@ msgstr "Datum der nächsten Rechnung"
 msgid "Day(s)"
 msgstr "Tag(e)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -867,7 +887,7 @@ msgid "Discount (%)"
 msgstr "Rabatt (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Rabatt muss kleiner oder gleich 100 sein"
@@ -1265,6 +1285,15 @@ msgstr ""
 msgid "Note"
 msgstr "Notiz"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Note Invoicing Mode"
+msgstr "Abrechnungsart"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1343,7 +1372,7 @@ msgid "Plan successor allowed?"
 msgstr "Nachfolger planen erlaubt?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr "Nachfolger planen für diese Position nicht zulässig"
@@ -1354,7 +1383,7 @@ msgid "Planned"
 msgstr "Geplant"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Legen Sie bitte ein %s-Journal  für das Unternehmen '%s' fest."
@@ -1593,7 +1622,7 @@ msgid "Stop allowed?"
 msgstr "Beenden erlaubt?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr "Beenden für diese Position nicht zulässig"
@@ -1604,7 +1633,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr "Nachfolger beenden/planen erlaubt?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr "Nachfolger beenden/planen in dieser Position nicht zulässig"
@@ -1659,7 +1688,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1750,7 +1779,7 @@ msgid "Un-cancel"
 msgstr "Stornoaufhebung"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr "Stornoaufhebung für diese Position nicht zulässig"
@@ -1830,6 +1859,20 @@ msgstr "Website-Kommunikationshistorie"
 msgid "Week(s)"
 msgstr "Woche(n)"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1846,13 +1889,13 @@ msgid "Year(s)"
 msgstr "Jahr(e)"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr "Sie haben nicht das Recht, Verträge zu kündigen."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
@@ -1860,7 +1903,7 @@ msgstr ""
 "abgerechnet wurde."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1870,7 +1913,7 @@ msgstr ""
 "Vertragsposition '%s' liegen."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1880,7 +1923,7 @@ msgstr ""
 "Vertragsposition '%s' liegen."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, fuzzy, python-format
 #| msgid ""
 #| "You can't have the end date before the date of last invoice for the "
@@ -1893,7 +1936,7 @@ msgstr ""
 "Vertragsposition '%s' liegen."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1903,7 +1946,7 @@ msgstr ""
 "Vertragsposition '%s' liegen."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/el_GR.po b/contract/i18n/el_GR.po
index 5fdf93a87..551471b65 100644
--- a/contract/i18n/el_GR.po
+++ b/contract/i18n/el_GR.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -344,7 +344,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -393,7 +393,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -522,37 +522,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -562,7 +562,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -574,7 +574,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -586,7 +586,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -598,7 +598,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -609,7 +609,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -696,6 +696,13 @@ msgstr "Δημιουργήθηκε στις"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -748,6 +755,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -764,7 +782,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1148,6 +1166,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1226,7 +1251,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1237,7 +1262,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1472,7 +1497,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1483,7 +1508,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1538,7 +1563,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1627,7 +1652,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1707,6 +1732,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1723,19 +1762,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1743,7 +1782,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1751,7 +1790,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1759,7 +1798,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1767,7 +1806,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/en_GB.po b/contract/i18n/en_GB.po
index b5cf391fe..b7bb8bd0b 100644
--- a/contract/i18n/en_GB.po
+++ b/contract/i18n/en_GB.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Created on"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/es.po b/contract/i18n/es.po
index cd1532c49..ef27c4ac1 100644
--- a/contract/i18n/es.po
+++ b/contract/i18n/es.po
@@ -267,19 +267,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Precio unidad</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr "Una línea de contrato cancelada no puede ser auto renovada"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr "Una línea de contrato con sucesor no puede ser auto renovada"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr "Una línea de contrato con sucesor debe tener una fecha de finalización"
@@ -334,7 +334,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -419,7 +419,7 @@ msgid "Cancel allowed?"
 msgstr "Cancelar permitido?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr "Cancelar no permitido para esta línea"
@@ -468,7 +468,7 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "Componer correo electrónico"
@@ -597,7 +597,7 @@ msgid "Contract Type"
 msgstr "Tipo de contrato"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
@@ -605,31 +605,31 @@ msgstr ""
 "fecha de fin"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr "Línea de contrato no cancelada: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr "Línea de contrato y su predecesor superpuestos"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr "Línea de contrato y su sucesor superpuestos"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr "Línea de contrato cancelada: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -643,7 +643,7 @@ msgstr ""
 "                            "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -661,7 +661,7 @@ msgstr ""
 "                    "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -679,7 +679,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -697,7 +697,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr "La línea del contrato debe cancelarse antes de eliminar"
@@ -708,7 +708,7 @@ msgid "Contract lines"
 msgstr "Líneas de contrato"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -800,6 +800,15 @@ msgstr "Creado en"
 msgid "Currency"
 msgstr "Moneda"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+#, fuzzy
+#| msgid "Customer"
+msgid "Custom"
+msgstr "Cliente"
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -852,6 +861,17 @@ msgstr "Próxima fecha de factura"
 msgid "Day(s)"
 msgstr "Día(s)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -868,7 +888,7 @@ msgid "Discount (%)"
 msgstr "Descuento (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "El descuento debería ser menor o igual a 100"
@@ -1271,6 +1291,15 @@ msgstr "Próximo Período de Inicio"
 msgid "Note"
 msgstr "Notas"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing offset"
+msgid "Note Invoicing Mode"
+msgstr "Compensación de Facturación"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1351,7 +1380,7 @@ msgid "Plan successor allowed?"
 msgstr "Plan sucesor permitido?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr "El sucesor del plan no está permitido para esta línea"
@@ -1362,7 +1391,7 @@ msgid "Planned"
 msgstr "Planificado"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Por favor defina un diario de %s para la compañía '%s'."
@@ -1605,7 +1634,7 @@ msgid "Stop allowed?"
 msgstr "Permitir detener?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr "Detener no permitido para esta línea"
@@ -1616,7 +1645,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr "Detener / Plan sucesor permitido?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr "El sucesor Stop / Plan no está permitido para esta línea"
@@ -1671,7 +1700,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1774,7 +1803,7 @@ msgid "Un-cancel"
 msgstr "Descancelar"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr "Descancelar no permitido para esta línea"
@@ -1854,6 +1883,20 @@ msgstr "Historial de comunicación del sitio web"
 msgid "Week(s)"
 msgstr "Semana(s)"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1870,19 +1913,19 @@ msgid "Year(s)"
 msgstr "Año(s)"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr "No tiene permitido rescindir contratos."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr "No puede retrasar una línea de contrato facturada al menos una vez."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1892,7 +1935,7 @@ msgstr ""
 "del contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1902,7 +1945,7 @@ msgstr ""
 "factura para la línea del contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1912,7 +1955,7 @@ msgstr ""
 "factura para la línea de contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1922,7 +1965,7 @@ msgstr ""
 "para la línea del contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/es_AR.po b/contract/i18n/es_AR.po
index 30c0e1896..995d232d0 100644
--- a/contract/i18n/es_AR.po
+++ b/contract/i18n/es_AR.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Creado en"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/es_CL.po b/contract/i18n/es_CL.po
index bd990fc38..b4e5855d4 100644
--- a/contract/i18n/es_CL.po
+++ b/contract/i18n/es_CL.po
@@ -249,19 +249,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -316,7 +316,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -400,7 +400,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -449,7 +449,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -576,37 +576,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -616,7 +616,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -628,7 +628,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -640,7 +640,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -652,7 +652,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -663,7 +663,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -748,6 +748,13 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -800,6 +807,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -816,7 +834,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1198,6 +1216,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1276,7 +1301,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1287,7 +1312,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1522,7 +1547,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1533,7 +1558,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1588,7 +1613,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1677,7 +1702,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1757,6 +1782,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1773,19 +1812,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1793,7 +1832,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1801,7 +1840,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1809,7 +1848,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1817,7 +1856,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/es_CO.po b/contract/i18n/es_CO.po
index 72ddac395..1224203be 100644
--- a/contract/i18n/es_CO.po
+++ b/contract/i18n/es_CO.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -688,6 +688,13 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -740,6 +747,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -756,7 +774,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1138,6 +1156,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1216,7 +1241,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1227,7 +1252,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1462,7 +1487,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1473,7 +1498,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1528,7 +1553,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1617,7 +1642,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1697,6 +1722,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1713,19 +1752,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1733,7 +1772,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1741,7 +1780,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1749,7 +1788,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1757,7 +1796,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/es_CR.po b/contract/i18n/es_CR.po
index 62e3c1aaa..69bf841fe 100644
--- a/contract/i18n/es_CR.po
+++ b/contract/i18n/es_CR.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Creado en"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/es_DO.po b/contract/i18n/es_DO.po
index 2055cb257..74e454a83 100644
--- a/contract/i18n/es_DO.po
+++ b/contract/i18n/es_DO.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -688,6 +688,13 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -740,6 +747,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -756,7 +774,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1138,6 +1156,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1216,7 +1241,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1227,7 +1252,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1462,7 +1487,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1473,7 +1498,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1528,7 +1553,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1617,7 +1642,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1697,6 +1722,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1713,19 +1752,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1733,7 +1772,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1741,7 +1780,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1749,7 +1788,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1757,7 +1796,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/es_EC.po b/contract/i18n/es_EC.po
index 6bb30e86f..853e07701 100644
--- a/contract/i18n/es_EC.po
+++ b/contract/i18n/es_EC.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -688,6 +688,13 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -740,6 +747,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -756,7 +774,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1138,6 +1156,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1216,7 +1241,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1227,7 +1252,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1462,7 +1487,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1473,7 +1498,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1528,7 +1553,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1617,7 +1642,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1697,6 +1722,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1713,19 +1752,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1733,7 +1772,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1741,7 +1780,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1749,7 +1788,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1757,7 +1796,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/es_ES.po b/contract/i18n/es_ES.po
index 5b6cc8266..f48c7fdee 100644
--- a/contract/i18n/es_ES.po
+++ b/contract/i18n/es_ES.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Creado en"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/es_MX.po b/contract/i18n/es_MX.po
index 9c69e03c5..77d8e2a44 100644
--- a/contract/i18n/es_MX.po
+++ b/contract/i18n/es_MX.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -344,7 +344,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -393,7 +393,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -522,37 +522,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -562,7 +562,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -574,7 +574,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -586,7 +586,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -598,7 +598,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -609,7 +609,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -696,6 +696,13 @@ msgstr "Creado en"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -748,6 +755,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -764,7 +782,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1148,6 +1166,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1226,7 +1251,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1237,7 +1262,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1472,7 +1497,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1483,7 +1508,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1538,7 +1563,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1627,7 +1652,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1707,6 +1732,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1723,19 +1762,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1743,7 +1782,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1751,7 +1790,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1759,7 +1798,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1767,7 +1806,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/es_PY.po b/contract/i18n/es_PY.po
index d907fa328..e9d2eabe9 100644
--- a/contract/i18n/es_PY.po
+++ b/contract/i18n/es_PY.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -688,6 +688,13 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -740,6 +747,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -756,7 +774,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1138,6 +1156,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1216,7 +1241,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1227,7 +1252,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1462,7 +1487,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1473,7 +1498,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1528,7 +1553,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1617,7 +1642,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1697,6 +1722,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1713,19 +1752,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1733,7 +1772,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1741,7 +1780,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1749,7 +1788,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1757,7 +1796,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/es_VE.po b/contract/i18n/es_VE.po
index 112558b38..d30a485ba 100644
--- a/contract/i18n/es_VE.po
+++ b/contract/i18n/es_VE.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Creado en"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/et.po b/contract/i18n/et.po
index 9ea00838a..ba3ca41a6 100644
--- a/contract/i18n/et.po
+++ b/contract/i18n/et.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "Loodud"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1139,6 +1157,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1217,7 +1242,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1228,7 +1253,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1463,7 +1488,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1474,7 +1499,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1529,7 +1554,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1618,7 +1643,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1698,6 +1723,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1714,19 +1753,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1734,7 +1773,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1742,7 +1781,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1750,7 +1789,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1758,7 +1797,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/eu.po b/contract/i18n/eu.po
index e3baf86ce..f3bab3efb 100644
--- a/contract/i18n/eu.po
+++ b/contract/i18n/eu.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -687,6 +687,13 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -739,6 +746,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -755,7 +773,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1137,6 +1155,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1215,7 +1240,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1226,7 +1251,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1461,7 +1486,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1472,7 +1497,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1527,7 +1552,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1616,7 +1641,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1696,6 +1721,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1712,19 +1751,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1732,7 +1771,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1740,7 +1779,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1748,7 +1787,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1756,7 +1795,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/fa.po b/contract/i18n/fa.po
index 1090b7b7a..43a5be5c2 100644
--- a/contract/i18n/fa.po
+++ b/contract/i18n/fa.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "ایجاد شده در"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/fi.po b/contract/i18n/fi.po
index af1ef807d..ba5a61766 100644
--- a/contract/i18n/fi.po
+++ b/contract/i18n/fi.po
@@ -260,13 +260,13 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Yksikköhinta</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr "Peruttua sopimusriviä ei voida laittaa uusiutumaan automaattisesti"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 "automaattisesti"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr "Jos sopimusrivillä on seuraaja, sillä täytyy olla päättymispäivä"
@@ -329,7 +329,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr "Automaattisesti uusittavalla rivillä täytyy olla päättymispäivä"
@@ -421,7 +421,7 @@ msgid "Cancel allowed?"
 msgstr "Peruminen sallittu"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr "Peruminen ei ole sallittu tälle riville"
@@ -470,7 +470,7 @@ msgid "Company"
 msgstr "Yritys"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "Kirjoita sähköposti"
@@ -603,37 +603,37 @@ msgid "Contract Type"
 msgstr "Sopimustyyppi"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr "Sopimusrivin '%s' aloituspäivä ei voi olla päättymispäivän jälkeen"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr "Sopimusrivin palautettu perutuista: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr "Sopimusrivi ja sen edeltäjä ovat päällekkäin"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr "Sopimusrivi ja sen seuraaja ovat päällekkäin"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr "Sopimusrivi peruttu: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -646,7 +646,7 @@ msgstr ""
 "                            "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -664,7 +664,7 @@ msgstr ""
 "                    "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -682,7 +682,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -700,7 +700,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr "Sopimusrivi pitää perua ennen poistamista"
@@ -711,7 +711,7 @@ msgid "Contract lines"
 msgstr "Sopimusrivit"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -800,6 +800,15 @@ msgstr "Luotu"
 msgid "Currency"
 msgstr "Valuutta"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+#, fuzzy
+#| msgid "Customer"
+msgid "Custom"
+msgstr "Asiakas"
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -852,6 +861,17 @@ msgstr "Seuraava laskutuspäivä"
 msgid "Day(s)"
 msgstr "Päivä(ä)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -868,7 +888,7 @@ msgid "Discount (%)"
 msgstr "Alennus (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Alennus voi olla korkeintaan 100"
@@ -1260,6 +1280,15 @@ msgstr "Seuraavan kauden alku"
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing offset"
+msgid "Note Invoicing Mode"
+msgstr "Laskutuksen viive"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1340,7 +1369,7 @@ msgid "Plan successor allowed?"
 msgstr "Sopimuksen seuraaja sallittu"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr "Sopimuksen seuraaja ei ole sallittu tälle riville"
@@ -1351,7 +1380,7 @@ msgid "Planned"
 msgstr "Suunniteltu"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Aseta %s-päiväkirja yritykselle '%s'."
@@ -1594,7 +1623,7 @@ msgid "Stop allowed?"
 msgstr "Päättäminen sallittu"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr "Päättäminen ei ole sallittu tälle riville"
@@ -1605,7 +1634,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr "Päättäminen/sopimuksen seuraaja sallittu"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr "Päättäminen/sopimuksen seuraaja ei ole sallittu tälle riville"
@@ -1660,7 +1689,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1762,7 +1791,7 @@ msgid "Un-cancel"
 msgstr "Peru peruminen"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr "Perumisen perumista ei ole sallittu tälle riville"
@@ -1842,6 +1871,20 @@ msgstr "Verkkosivun kommunikaatiohistoria"
 msgid "Week(s)"
 msgstr "Viikkoa"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1858,19 +1901,19 @@ msgid "Year(s)"
 msgstr "Vuotta"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr "Et voi viivästyttää sopimusriviä, jos sitä on jo laskutettu."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1879,7 +1922,7 @@ msgstr ""
 "Seuraavan laskun päiväys ei voi olla ennen sopimusrivin '%s' alkamispäivää"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1888,7 +1931,7 @@ msgstr ""
 "Sopimusrivin '%s' päättymispäivä ei voi olla ennen viimeisen laskun päiväystä"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1898,7 +1941,7 @@ msgstr ""
 "päiväystä '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1906,7 +1949,7 @@ msgid ""
 msgstr "Sopimusrivin '%s' alkupäivä ei voi olla päättymispäivän jälkeen"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr "Sopimusriville '%s' on määritettävä seuraavan laskun päiväys"
diff --git a/contract/i18n/fr.po b/contract/i18n/fr.po
index b35909fed..d0f351360 100644
--- a/contract/i18n/fr.po
+++ b/contract/i18n/fr.po
@@ -270,14 +270,14 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Prix unitaire</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 "Une ligne de contrat annulée ne peut pas être renouvelée automatiquement"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
@@ -285,7 +285,7 @@ msgstr ""
 "automatiquement"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr "Une ligne de contrat vouée à être succédée doit avoir une date de fin"
@@ -340,7 +340,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr "Une ligne auto-renouvelable doit avoir une date de fin"
@@ -424,7 +424,7 @@ msgid "Cancel allowed?"
 msgstr "Annulation autorisée ?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr "Annulation non autorisée pour cette ligne"
@@ -473,7 +473,7 @@ msgid "Company"
 msgstr "Société"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "Rédiger courriel"
@@ -602,38 +602,38 @@ msgid "Contract Type"
 msgstr "Type de contrat"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 "La ligne de contrat contrat '%s' ne peut pas démarrer après la date de fin"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr "Annulation de la ligne de contrat annulée : %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr "La ligne de contrat et son prédecesseur se chevauchent"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr "La ligne de contrat et son successeur se chevauchent"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr "Ligne de contrat annulée : %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -647,7 +647,7 @@ msgstr ""
 "                            "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -665,7 +665,7 @@ msgstr ""
 "                    "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -683,7 +683,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -702,7 +702,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr "La ligne de contrat doit être annulée avant d'être supprimée"
@@ -713,7 +713,7 @@ msgid "Contract lines"
 msgstr "Lignes de contrat"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -800,6 +800,15 @@ msgstr "Créé le"
 msgid "Currency"
 msgstr "Devise"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+#, fuzzy
+#| msgid "Customer"
+msgid "Custom"
+msgstr "Client"
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -852,6 +861,17 @@ msgstr "Date de la prochaine facture"
 msgid "Day(s)"
 msgstr "Jour(s)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -868,7 +888,7 @@ msgid "Discount (%)"
 msgstr "Remise (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Remise doit être inférieur ou égale à 100"
@@ -1266,6 +1286,15 @@ msgstr "Début de la prochaine période"
 msgid "Note"
 msgstr "Commentaires"
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing offset"
+msgid "Note Invoicing Mode"
+msgstr "Décalage de facturation"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1346,7 +1375,7 @@ msgid "Plan successor allowed?"
 msgstr "Successeur de l'abonnement permis ?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr "Successeur de l'abonnement non autorisé sur cette ligne"
@@ -1357,7 +1386,7 @@ msgid "Planned"
 msgstr "Planifié"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Veuiller définir un journal %s pour l'entreprise '%s'."
@@ -1600,7 +1629,7 @@ msgid "Stop allowed?"
 msgstr "Interruption autorisée ?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr "Interruption non autorisée pour cette ligne"
@@ -1611,7 +1640,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr "Interruption / Planifier un successeur autorisé ?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr "Interruption / Planifier un successeur non autorisé sur cette ligne"
@@ -1666,7 +1695,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1758,7 +1787,7 @@ msgid "Un-cancel"
 msgstr "Annuler l'annulation"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr "Annulation de l'annulation non autorisée pour cette ligne"
@@ -1838,6 +1867,20 @@ msgstr "Historique de la communication du site web"
 msgid "Week(s)"
 msgstr "Semaine(s)"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1854,20 +1897,20 @@ msgid "Year(s)"
 msgstr "Année(s)"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr "Vous n'êtes pas autorisé à résilier des contrats."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 "Vous ne pouvez pas retarder une ligne de contrat facturer au moins une fois."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1877,7 +1920,7 @@ msgstr ""
 "la date de début de contrat '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1887,7 +1930,7 @@ msgstr ""
 "facture pour la ligne de contrat '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1897,7 +1940,7 @@ msgstr ""
 "dernière facturation de la ligne de contrat '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1907,7 +1950,7 @@ msgstr ""
 "facture pour la ligne '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/fr_CA.po b/contract/i18n/fr_CA.po
index 85efc4bf0..2b2dfb5c8 100644
--- a/contract/i18n/fr_CA.po
+++ b/contract/i18n/fr_CA.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Créé le"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1144,6 +1162,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1222,7 +1247,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1233,7 +1258,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1468,7 +1493,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1479,7 +1504,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1534,7 +1559,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1623,7 +1648,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1703,6 +1728,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1719,19 +1758,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1739,7 +1778,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1747,7 +1786,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1755,7 +1794,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1763,7 +1802,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/fr_CH.po b/contract/i18n/fr_CH.po
index 3105e5245..894858260 100644
--- a/contract/i18n/fr_CH.po
+++ b/contract/i18n/fr_CH.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Créé le"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/gl.po b/contract/i18n/gl.po
index a2ce58b2e..42138f7dc 100644
--- a/contract/i18n/gl.po
+++ b/contract/i18n/gl.po
@@ -253,19 +253,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Prezo unidade</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -322,7 +322,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -412,7 +412,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -463,7 +463,7 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "Compoñer correo electrónico"
@@ -614,38 +614,38 @@ msgid "Contract Type"
 msgstr "Tipos de contrato"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, fuzzy, python-format
 #| msgid "Contract '%s' start date can't be later than end date"
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr "A data de inicio do contrato '%s' non pode ser superior á data de fin"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -655,7 +655,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -667,7 +667,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -679,7 +679,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -691,7 +691,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -704,7 +704,7 @@ msgid "Contract lines"
 msgstr "Líneas de contrato"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -798,6 +798,15 @@ msgstr "Creado en"
 msgid "Currency"
 msgstr "Recorrencia"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+#, fuzzy
+#| msgid "Customer"
+msgid "Custom"
+msgstr "Cliente"
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -850,6 +859,17 @@ msgstr "Próxima data de factura"
 msgid "Day(s)"
 msgstr "Día(s)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -866,7 +886,7 @@ msgid "Discount (%)"
 msgstr "Desconto (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "O desconto debería de ser menor ou igual a 100"
@@ -1278,6 +1298,15 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Note Invoicing Mode"
+msgstr "Tipo de facturación"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1360,7 +1389,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1371,7 +1400,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Por favor defina un diario de %s para a compañía '%s'."
@@ -1622,7 +1651,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1633,7 +1662,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1690,7 +1719,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1782,7 +1811,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1864,6 +1893,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr "Semana(s)"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1880,19 +1923,19 @@ msgid "Year(s)"
 msgstr "Ano(s)"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, fuzzy, python-format
 #| msgid ""
 #| "You can't have a next invoicing date before the start of the contract '%s'"
@@ -1904,7 +1947,7 @@ msgstr ""
 "contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, fuzzy, python-format
 #| msgid ""
 #| "You can't have a next invoicing date before the start of the contract '%s'"
@@ -1916,7 +1959,7 @@ msgstr ""
 "contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, fuzzy, python-format
 #| msgid ""
 #| "You can't have a next invoicing date before the start of the contract '%s'"
@@ -1928,7 +1971,7 @@ msgstr ""
 "contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, fuzzy, python-format
 #| msgid ""
 #| "You can't have a next invoicing date before the start of the contract '%s'"
@@ -1940,7 +1983,7 @@ msgstr ""
 "contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, fuzzy, python-format
 #| msgid "You must supply a next invoicing date for contract '%s'"
 msgid "You must supply a date of next invoice for contract line '%s'"
diff --git a/contract/i18n/gl_ES.po b/contract/i18n/gl_ES.po
index 0779c3456..d40ccba9c 100644
--- a/contract/i18n/gl_ES.po
+++ b/contract/i18n/gl_ES.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -688,6 +688,13 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -740,6 +747,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -756,7 +774,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1138,6 +1156,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1216,7 +1241,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1227,7 +1252,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1462,7 +1487,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1473,7 +1498,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1528,7 +1553,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1617,7 +1642,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1697,6 +1722,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1713,19 +1752,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1733,7 +1772,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1741,7 +1780,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1749,7 +1788,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1757,7 +1796,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/he.po b/contract/i18n/he.po
index abf7b6492..cdce81e45 100644
--- a/contract/i18n/he.po
+++ b/contract/i18n/he.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "נוצר ב-"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/hi_IN.po b/contract/i18n/hi_IN.po
index 51d24719d..dd3e837ab 100644
--- a/contract/i18n/hi_IN.po
+++ b/contract/i18n/hi_IN.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -346,7 +346,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -395,7 +395,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -540,37 +540,37 @@ msgid "Contract Type"
 msgstr "अनुबंध टेम्पलेट"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -604,7 +604,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -616,7 +616,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -629,7 +629,7 @@ msgid "Contract lines"
 msgstr "अनुबंध"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -720,6 +720,13 @@ msgstr "को निर्मित"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -773,6 +780,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr "दिन()"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -789,7 +807,7 @@ msgid "Discount (%)"
 msgstr "छूट (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1185,6 +1203,15 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoice"
+msgid "Note Invoicing Mode"
+msgstr "बीजक"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1265,7 +1292,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1276,7 +1303,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1517,7 +1544,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1528,7 +1555,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1585,7 +1612,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1675,7 +1702,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1755,6 +1782,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1771,19 +1812,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1791,7 +1832,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1799,7 +1840,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1807,7 +1848,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1815,7 +1856,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/hr.po b/contract/i18n/hr.po
index ac1395b92..3d22101f6 100644
--- a/contract/i18n/hr.po
+++ b/contract/i18n/hr.po
@@ -197,19 +197,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Jed.cijena</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -264,7 +264,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -353,7 +353,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -402,7 +402,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -543,37 +543,37 @@ msgid "Contract Type"
 msgstr "Ugovor"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -583,7 +583,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -595,7 +595,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -607,7 +607,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -619,7 +619,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -632,7 +632,7 @@ msgid "Contract lines"
 msgstr "Ugovori"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -721,6 +721,13 @@ msgstr "Kreirano"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -774,6 +781,17 @@ msgstr "Datum sljedećeg računa"
 msgid "Day(s)"
 msgstr "Dan(a)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -790,7 +808,7 @@ msgid "Discount (%)"
 msgstr "Popust (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Popusti bi trebali biti manji ili jednaki 100"
@@ -1196,6 +1214,15 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Note Invoicing Mode"
+msgstr "Vrsta izdavanja računa"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1276,7 +1303,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1287,7 +1314,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1530,7 +1557,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1541,7 +1568,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1598,7 +1625,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1688,7 +1715,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1768,6 +1795,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr "Tjedan(i)"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1784,19 +1825,19 @@ msgid "Year(s)"
 msgstr "Godina(e)"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1804,7 +1845,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1812,7 +1853,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1820,7 +1861,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1828,7 +1869,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/hr_HR.po b/contract/i18n/hr_HR.po
index 4a949a7a7..6e9c91b6a 100644
--- a/contract/i18n/hr_HR.po
+++ b/contract/i18n/hr_HR.po
@@ -190,19 +190,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -257,7 +257,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -347,7 +347,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -396,7 +396,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -541,37 +541,37 @@ msgid "Contract Type"
 msgstr "Predložak ugovora"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -581,7 +581,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -593,7 +593,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -605,7 +605,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -617,7 +617,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -630,7 +630,7 @@ msgid "Contract lines"
 msgstr "Ugovori"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -723,6 +723,13 @@ msgstr "Kreirano"
 msgid "Currency"
 msgstr "Ponavljanje"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -776,6 +783,17 @@ msgstr "Datum sljedećeg računa"
 msgid "Day(s)"
 msgstr "Dan(a)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -792,7 +810,7 @@ msgid "Discount (%)"
 msgstr "Popust (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Popust treba biti manji ili jednak 100"
@@ -1200,6 +1218,15 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Note Invoicing Mode"
+msgstr "Tip izdavanja računa"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1280,7 +1307,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1291,7 +1318,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, fuzzy, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Molimo definirajte dnevnik prodaje za poduzeće '%s'."
@@ -1540,7 +1567,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1551,7 +1578,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1608,7 +1635,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1698,7 +1725,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1778,6 +1805,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr "Tjedan(a)"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1794,19 +1835,19 @@ msgid "Year(s)"
 msgstr "Godina(e)"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1814,7 +1855,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1822,7 +1863,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1830,7 +1871,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1838,7 +1879,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/hu.po b/contract/i18n/hu.po
index d92beee02..c44cdaccd 100644
--- a/contract/i18n/hu.po
+++ b/contract/i18n/hu.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -343,7 +343,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -392,7 +392,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -521,37 +521,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -561,7 +561,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -573,7 +573,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -585,7 +585,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -597,7 +597,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -608,7 +608,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -695,6 +695,13 @@ msgstr "Létrehozás dátuma"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -747,6 +754,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -763,7 +781,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1147,6 +1165,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1225,7 +1250,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1236,7 +1261,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1471,7 +1496,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1482,7 +1507,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1537,7 +1562,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1626,7 +1651,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1706,6 +1731,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1722,19 +1761,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1742,7 +1781,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1750,7 +1789,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1758,7 +1797,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1766,7 +1805,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/id.po b/contract/i18n/id.po
index d5f0fcdb8..c26553898 100644
--- a/contract/i18n/id.po
+++ b/contract/i18n/id.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "Dibuat pada"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/it.po b/contract/i18n/it.po
index e250c212f..5736e2134 100644
--- a/contract/i18n/it.po
+++ b/contract/i18n/it.po
@@ -267,14 +267,14 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Prezzo unitario</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 "Una riga di contratto annullato non può essere impostata per l'auto-rinnovo"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
@@ -282,7 +282,7 @@ msgstr ""
 "rinnovo"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr "Una riga di contratto con successore deve avere una data fine"
@@ -337,7 +337,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr "Una riga di auto-rinnovo deve avere una data fine"
@@ -429,7 +429,7 @@ msgid "Cancel allowed?"
 msgstr "Annullamento permesso?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr "Annullamento non permesso per questa riga"
@@ -478,7 +478,7 @@ msgid "Company"
 msgstr "Azienda"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "Comporre email"
@@ -615,7 +615,7 @@ msgid "Contract Type"
 msgstr "Tipo contratto"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
@@ -623,31 +623,31 @@ msgstr ""
 "data finale"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr "Riga contratto ri-attivata: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr "Riga contratto e sua precedente sovrapposte"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr "Riga contratto e sua seguente sovrapposte"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr "Riga contratto annullata: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -661,7 +661,7 @@ msgstr ""
 "                            "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -679,7 +679,7 @@ msgstr ""
 "                    "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -697,7 +697,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -715,7 +715,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr "La riga contratto deve essere annullata prima di essere eliminata"
@@ -726,7 +726,7 @@ msgid "Contract lines"
 msgstr "Righe contratto"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -818,6 +818,15 @@ msgstr "Creato il"
 msgid "Currency"
 msgstr "Valuta"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+#, fuzzy
+#| msgid "Customer"
+msgid "Custom"
+msgstr "Cliente"
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -870,6 +879,17 @@ msgstr "Data prossima fattura"
 msgid "Day(s)"
 msgstr "Giorni"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -886,7 +906,7 @@ msgid "Discount (%)"
 msgstr "Sconto (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Lo sconto dovrebbe essere minore o uguale a 100"
@@ -1284,6 +1304,15 @@ msgstr "Inizio prossimo periodo"
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Note Invoicing Mode"
+msgstr "Tipo fatturazione"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1362,7 +1391,7 @@ msgid "Plan successor allowed?"
 msgstr "Pianificazione successore permessa?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr "Pianificazione successore non permessa per questa riga"
@@ -1373,7 +1402,7 @@ msgid "Planned"
 msgstr "Pianificata"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Definire un registro vendite per l'azienda \"%s\"."
@@ -1616,7 +1645,7 @@ msgid "Stop allowed?"
 msgstr "Arresto permesso?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr "Arresto non permesso per questa riga"
@@ -1627,7 +1656,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr "Arresto/pianificazione del successore permessi?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr "Arresto/pianificazione del successore non permessi per questa riga"
@@ -1682,7 +1711,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1782,7 +1811,7 @@ msgid "Un-cancel"
 msgstr "Ri-attivare"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr "Ri-attivazione non permessa per questa riga"
@@ -1862,6 +1891,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr "Settimana(e)"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1878,20 +1921,20 @@ msgid "Year(s)"
 msgstr "Anno(i)"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 "Non è possibile ritardare una riga contratto fatturata almeno una volta."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1901,7 +1944,7 @@ msgstr ""
 "riga contratto '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1911,7 +1954,7 @@ msgstr ""
 "fattura per la riga contratto '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1921,7 +1964,7 @@ msgstr ""
 "fattura per la riga contratto '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1931,7 +1974,7 @@ msgstr ""
 "fattura per la riga contratto '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/ja.po b/contract/i18n/ja.po
index 7ea4cac7e..dc25b8ea2 100644
--- a/contract/i18n/ja.po
+++ b/contract/i18n/ja.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "作成日"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/ko.po b/contract/i18n/ko.po
index f9d2c6834..fa7c7c118 100644
--- a/contract/i18n/ko.po
+++ b/contract/i18n/ko.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "작성일"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/lt.po b/contract/i18n/lt.po
index e80dd8b91..986dff297 100644
--- a/contract/i18n/lt.po
+++ b/contract/i18n/lt.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Sukurta"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/lt_LT.po b/contract/i18n/lt_LT.po
index 3304f8a08..5002d702e 100644
--- a/contract/i18n/lt_LT.po
+++ b/contract/i18n/lt_LT.po
@@ -190,19 +190,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -257,7 +257,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -341,7 +341,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -390,7 +390,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,37 +517,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -557,7 +557,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -569,7 +569,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -581,7 +581,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -593,7 +593,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -604,7 +604,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -691,6 +691,13 @@ msgstr "Sukurta"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -743,6 +750,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -759,7 +777,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1143,6 +1161,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1221,7 +1246,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1232,7 +1257,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1467,7 +1492,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1478,7 +1503,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1533,7 +1558,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1622,7 +1647,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1702,6 +1727,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1718,19 +1757,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1738,7 +1777,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1746,7 +1785,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1754,7 +1793,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1762,7 +1801,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/lv.po b/contract/i18n/lv.po
index acef80c6a..2bb3731de 100644
--- a/contract/i18n/lv.po
+++ b/contract/i18n/lv.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Izveidots"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/mk.po b/contract/i18n/mk.po
index e25227320..36580e118 100644
--- a/contract/i18n/mk.po
+++ b/contract/i18n/mk.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "Креирано на"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/mn.po b/contract/i18n/mn.po
index 5784a014e..0dc10e301 100644
--- a/contract/i18n/mn.po
+++ b/contract/i18n/mn.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "Үүсгэсэн огноо"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/nb.po b/contract/i18n/nb.po
index e16c6c130..f9e334ff0 100644
--- a/contract/i18n/nb.po
+++ b/contract/i18n/nb.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Opprettet"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/nb_NO.po b/contract/i18n/nb_NO.po
index e646e16eb..95e76f70b 100644
--- a/contract/i18n/nb_NO.po
+++ b/contract/i18n/nb_NO.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Laget den"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1144,6 +1162,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1222,7 +1247,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1233,7 +1258,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1468,7 +1493,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1479,7 +1504,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1534,7 +1559,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1623,7 +1648,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1703,6 +1728,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1719,19 +1758,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1739,7 +1778,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1747,7 +1786,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1755,7 +1794,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1763,7 +1802,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/nl.po b/contract/i18n/nl.po
index 9e2b8b332..cdc1775b1 100644
--- a/contract/i18n/nl.po
+++ b/contract/i18n/nl.po
@@ -263,7 +263,7 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Prijs per eenheid</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
@@ -271,7 +271,7 @@ msgstr ""
 "verlengen"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
@@ -279,7 +279,7 @@ msgstr ""
 "te verlengen"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr "Een contractregel met een opvolger moet een einddatum hebben"
@@ -334,7 +334,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr "Een automatische verlengingsregel moet een einddatum hebben"
@@ -428,7 +428,7 @@ msgid "Cancel allowed?"
 msgstr "Annuleren toestaan?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr "Annuleren niet toegestaan voor deze regel"
@@ -479,7 +479,7 @@ msgid "Company"
 msgstr "Bedrijf"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "Email opstellen"
@@ -620,37 +620,37 @@ msgid "Contract Type"
 msgstr "Soort Contract"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr "Contract '%s' startdatum kan niet later zijn dan einddatum"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr "Contractregel annuleren ongedaan gemaakt: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr "Contractregel en zijn voorganger overlappen"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr "Contractlijn en zijn opvolger overlappen elkaar"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr "Contractregel geannuleerd: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -665,7 +665,7 @@ msgstr ""
 "                            "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -683,7 +683,7 @@ msgstr ""
 "                    "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -701,7 +701,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -719,7 +719,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr "Contractregel moet worden geannuleerd voordat deze wordt verwijderd"
@@ -730,7 +730,7 @@ msgid "Contract lines"
 msgstr "Contractregels"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -822,6 +822,15 @@ msgstr "Aangemaakt op"
 msgid "Currency"
 msgstr "Herhaling"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+#, fuzzy
+#| msgid "Customer"
+msgid "Custom"
+msgstr "Klant"
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -874,6 +883,17 @@ msgstr "Datum volgende factuur"
 msgid "Day(s)"
 msgstr "Dag(en)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -890,7 +910,7 @@ msgid "Discount (%)"
 msgstr "Korting (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "De korting moet kleiner of gelijk aan 100 zijn"
@@ -1291,6 +1311,15 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Note Invoicing Mode"
+msgstr "Factuur soort"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1369,7 +1398,7 @@ msgid "Plan successor allowed?"
 msgstr "Opvolger plannen toegestaan?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr "Plannen opvolger niet toegestaan voor deze regel"
@@ -1380,7 +1409,7 @@ msgid "Planned"
 msgstr "Gepland"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "U dient een '%s' verkoopboek te definiëren voor het bedrijf '%s'."
@@ -1623,7 +1652,7 @@ msgid "Stop allowed?"
 msgstr "Stoppen toegestaan?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr "Stoppen niet toegestaan voor deze regel"
@@ -1634,7 +1663,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr "Stoppen / Plannen opvolger toegestaan?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr "Stoppen / Plannen opvolger is niet toegestaan"
@@ -1689,7 +1718,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1792,7 +1821,7 @@ msgid "Un-cancel"
 msgstr "Terugdraaien van annuleren"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr "Terugdraaien van annuleren niet toegestaan voor deze regel"
@@ -1872,6 +1901,20 @@ msgstr "Website communicatie geschiedenis"
 msgid "Week(s)"
 msgstr "Week/weken"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1888,13 +1931,13 @@ msgid "Year(s)"
 msgstr "Jaar/Jaren"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
@@ -1902,7 +1945,7 @@ msgstr ""
 "uitstellen."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1911,7 +1954,7 @@ msgstr ""
 "U kunt geen volgende factuurdatum vóór het begin van het contract '%s' hebben"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1921,7 +1964,7 @@ msgstr ""
 "contractregel '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, fuzzy, python-format
 #| msgid ""
 #| "You can't have the end date before the date of last invoice for the "
@@ -1934,7 +1977,7 @@ msgstr ""
 "contractregel '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1944,7 +1987,7 @@ msgstr ""
 "contractregel '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr "U moet een volgende factuurdatum opgeven voor contract '%s'"
diff --git a/contract/i18n/nl_BE.po b/contract/i18n/nl_BE.po
index 370f1d5f0..b6da93f74 100644
--- a/contract/i18n/nl_BE.po
+++ b/contract/i18n/nl_BE.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Gemaakt op"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/nl_NL.po b/contract/i18n/nl_NL.po
index e851b8a57..b1ad2433d 100644
--- a/contract/i18n/nl_NL.po
+++ b/contract/i18n/nl_NL.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -342,7 +342,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -391,7 +391,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -536,37 +536,37 @@ msgid "Contract Type"
 msgstr "Contractsjabloon"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -576,7 +576,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -588,7 +588,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -600,7 +600,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -612,7 +612,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -625,7 +625,7 @@ msgid "Contract lines"
 msgstr "Contracten"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -716,6 +716,13 @@ msgstr "Aangemaakt op"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -769,6 +776,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -785,7 +803,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1181,6 +1199,15 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoice"
+msgid "Note Invoicing Mode"
+msgstr "Factuur"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1261,7 +1288,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1272,7 +1299,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1511,7 +1538,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1522,7 +1549,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1579,7 +1606,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1669,7 +1696,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1749,6 +1776,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1765,19 +1806,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1785,7 +1826,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1793,7 +1834,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1801,7 +1842,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1809,7 +1850,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/pl.po b/contract/i18n/pl.po
index 6ec08ff50..18c410015 100644
--- a/contract/i18n/pl.po
+++ b/contract/i18n/pl.po
@@ -190,19 +190,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -257,7 +257,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -341,7 +341,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -390,7 +390,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,37 +517,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -557,7 +557,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -569,7 +569,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -581,7 +581,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -593,7 +593,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -604,7 +604,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -691,6 +691,13 @@ msgstr "Data utworzenia"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -743,6 +750,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -759,7 +777,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1143,6 +1161,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1221,7 +1246,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1232,7 +1257,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1467,7 +1492,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1478,7 +1503,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1533,7 +1558,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1622,7 +1647,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1702,6 +1727,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1718,19 +1757,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1738,7 +1777,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1746,7 +1785,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1754,7 +1793,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1762,7 +1801,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/pt.po b/contract/i18n/pt.po
index 463f78563..ea4430b94 100644
--- a/contract/i18n/pt.po
+++ b/contract/i18n/pt.po
@@ -270,14 +270,14 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Preço Unitário</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 "Uma linha de contrato cancelada não pode ser definida para auto-renovação"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
@@ -285,7 +285,7 @@ msgstr ""
 "renovação"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr "Uma linha de contrato com sucessora deve ter uma data de fim"
@@ -340,7 +340,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr "Uma linha de auto-renovação deve ter uma data de fim"
@@ -432,7 +432,7 @@ msgid "Cancel allowed?"
 msgstr "Cancelamento autorizado?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr "Cancelamento não autorizado para esta linha"
@@ -481,7 +481,7 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "Escrever E-mail"
@@ -614,37 +614,37 @@ msgid "Contract Type"
 msgstr "Tipo de Contrato"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr "A data de início do contrato '%s' não pode ser posterior à data de fim"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr "Linha de Contrato Não Cancelada: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr "A linha do contrato e a sua antecessora sobrepuseram-se"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr "A linha do contrato e a sua sucessora sobrepuseram-se"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr "Linha do contrato cancelada: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -658,7 +658,7 @@ msgstr ""
 "                            "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -676,7 +676,7 @@ msgstr ""
 "                    "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -694,7 +694,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -712,7 +712,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr "A linha do contrato deve ser cancelada antes de eliminada"
@@ -723,7 +723,7 @@ msgid "Contract lines"
 msgstr "Linhas de Contrato"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -812,6 +812,15 @@ msgstr "Criado em"
 msgid "Currency"
 msgstr "Divisa"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+#, fuzzy
+#| msgid "Customer"
+msgid "Custom"
+msgstr "Cliente"
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -864,6 +873,17 @@ msgstr "Data da Próxima Fatura"
 msgid "Day(s)"
 msgstr "Dia(s)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -880,7 +900,7 @@ msgid "Discount (%)"
 msgstr "Desconto (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "O desconto deve ser igual ou inferior a 100"
@@ -1273,6 +1293,14 @@ msgstr "Início do Próximo Período"
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+msgid "Note Invoicing Mode"
+msgstr "Deslocação de faturação"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1353,7 +1381,7 @@ msgid "Plan successor allowed?"
 msgstr "Autorizado plano sucessor?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr "Plano sucessor não é autorizado para esta linha"
@@ -1364,7 +1392,7 @@ msgid "Planned"
 msgstr "Planeado"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Por favor, defina um diário %s para a empresa '%s'."
@@ -1607,7 +1635,7 @@ msgid "Stop allowed?"
 msgstr "Paragem autorizada?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr "Paragem não autorizada para esta linha"
@@ -1618,7 +1646,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr "Paragem/Plano sucessor autorizados?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr "Paragem/Plano sucessor não autorizados para esta linha"
@@ -1673,7 +1701,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1776,7 +1804,7 @@ msgid "Un-cancel"
 msgstr "Descancelar"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr "Descancelamento não autorizado para esta linha"
@@ -1856,6 +1884,20 @@ msgstr "Histórico de comunicações do website"
 msgid "Week(s)"
 msgstr "Semana(s)"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1872,19 +1914,19 @@ msgid "Year(s)"
 msgstr "Ano(s)"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr "Não pode adiar uma linha de contrato já faturada pelo menos uma vez."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1893,7 +1935,7 @@ msgstr ""
 "Não pode ter uma data da próxima fatura anterior à do próprio contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1903,7 +1945,7 @@ msgstr ""
 "contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1913,7 +1955,7 @@ msgstr ""
 "linha de contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1923,7 +1965,7 @@ msgstr ""
 "contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/pt_BR.po b/contract/i18n/pt_BR.po
index 7c9a50aab..138a30630 100644
--- a/contract/i18n/pt_BR.po
+++ b/contract/i18n/pt_BR.po
@@ -262,7 +262,7 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Preço Unitário</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
@@ -270,7 +270,7 @@ msgstr ""
 "automática"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
@@ -278,7 +278,7 @@ msgstr ""
 "automática"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr "Uma linha de contrato com uma sucessora deve ter uma data final"
@@ -333,7 +333,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr "Uma linha de renovação automática deve possuir uma data final"
@@ -425,7 +425,7 @@ msgid "Cancel allowed?"
 msgstr "Cancelar Permitido?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr "Não é permitido o cancelamento para esta linha"
@@ -474,7 +474,7 @@ msgid "Company"
 msgstr "Empresa"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "Escrever E-mail"
@@ -609,38 +609,38 @@ msgid "Contract Type"
 msgstr "Tipo de Contrato"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 "Data inicial '%s' da linha do contrato não pode ser maior que a data final"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr "Linha do Contrato Não Cancelada: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr "A linha do contrato e sua antecessor se sobrepuseram"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr "A linha do contrato e seu sucessora se sobrepuseram"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr "Linha do contrato cancelada: %s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -654,7 +654,7 @@ msgstr ""
 "                            "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -672,7 +672,7 @@ msgstr ""
 "                    "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -690,7 +690,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -708,7 +708,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr "Linha do contrato deve ser cancelada antes de ser deletada"
@@ -719,7 +719,7 @@ msgid "Contract lines"
 msgstr "Linhas de Contrato"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -806,6 +806,15 @@ msgstr "Criado em"
 msgid "Currency"
 msgstr "Moeda"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+#, fuzzy
+#| msgid "Customer"
+msgid "Custom"
+msgstr "Cliente"
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -858,6 +867,17 @@ msgstr "Dia da Próxima Fatura"
 msgid "Day(s)"
 msgstr "Dia(s)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -874,7 +894,7 @@ msgid "Discount (%)"
 msgstr "Desconto (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "Desconto deve ser menor ou igual a 100"
@@ -1265,6 +1285,15 @@ msgstr "Início do próximo período"
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing offset"
+msgid "Note Invoicing Mode"
+msgstr "Tipo de faturamento"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1345,7 +1374,7 @@ msgid "Plan successor allowed?"
 msgstr "Plano sucessor permitido?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr "Plano sucessor não permitido para esta linha"
@@ -1356,7 +1385,7 @@ msgid "Planned"
 msgstr "Planejado"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Defina um %s diário para a empresa '%s'."
@@ -1599,7 +1628,7 @@ msgid "Stop allowed?"
 msgstr "Parar permitido?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr "Parar não permitido para esta linha"
@@ -1610,7 +1639,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr "Parar/Plano sucessor permitido?"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr "Parar/Plano sucessor não permitido para esta linha"
@@ -1665,7 +1694,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1767,7 +1796,7 @@ msgid "Un-cancel"
 msgstr "Cancelar Cancelamento"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr "Cancelar cancelamento não permitido para esta linha"
@@ -1847,6 +1876,20 @@ msgstr "Histórico de comunicação do site"
 msgid "Week(s)"
 msgstr "Semana(s)"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1863,19 +1906,19 @@ msgid "Year(s)"
 msgstr "Ano(s)"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr "Você não pode adiar uma linha de contrato faturada pelo menos uma vez."
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1885,7 +1928,7 @@ msgstr ""
 "contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1895,7 +1938,7 @@ msgstr ""
 "do contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, fuzzy, python-format
 #| msgid ""
 #| "You can't have the end date before the date of last invoice for the "
@@ -1908,7 +1951,7 @@ msgstr ""
 "do contrato '%s'"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1918,7 +1961,7 @@ msgstr ""
 "do contrato '%s\""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/pt_PT.po b/contract/i18n/pt_PT.po
index b88192f92..28891ab8a 100644
--- a/contract/i18n/pt_PT.po
+++ b/contract/i18n/pt_PT.po
@@ -190,19 +190,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -257,7 +257,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -345,7 +345,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -394,7 +394,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -523,37 +523,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -563,7 +563,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -575,7 +575,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -587,7 +587,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -599,7 +599,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -610,7 +610,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -697,6 +697,13 @@ msgstr "Criado em"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -749,6 +756,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -765,7 +783,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1151,6 +1169,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1229,7 +1254,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1240,7 +1265,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1475,7 +1500,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1486,7 +1511,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1541,7 +1566,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1630,7 +1655,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1710,6 +1735,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1726,19 +1765,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1746,7 +1785,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1754,7 +1793,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1762,7 +1801,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1770,7 +1809,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/ro.po b/contract/i18n/ro.po
index 17a91f290..c1c1833fd 100644
--- a/contract/i18n/ro.po
+++ b/contract/i18n/ro.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -344,7 +344,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -393,7 +393,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -522,37 +522,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -562,7 +562,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -574,7 +574,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -586,7 +586,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -598,7 +598,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -609,7 +609,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -696,6 +696,13 @@ msgstr "Creat la"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -748,6 +755,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -764,7 +782,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1150,6 +1168,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1228,7 +1253,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1239,7 +1264,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1474,7 +1499,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1485,7 +1510,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1540,7 +1565,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1629,7 +1654,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1709,6 +1734,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1725,19 +1764,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1769,7 +1808,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/ru.po b/contract/i18n/ru.po
index 082c395b8..26aabbf11 100644
--- a/contract/i18n/ru.po
+++ b/contract/i18n/ru.po
@@ -190,19 +190,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -257,7 +257,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -342,7 +342,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -391,7 +391,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -532,37 +532,37 @@ msgid "Contract Type"
 msgstr "Договоры"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -572,7 +572,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -584,7 +584,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -596,7 +596,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -608,7 +608,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -621,7 +621,7 @@ msgid "Contract lines"
 msgstr "Договоры"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -710,6 +710,13 @@ msgstr "Создан"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -763,6 +770,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -779,7 +797,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1175,6 +1193,15 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoice"
+msgid "Note Invoicing Mode"
+msgstr "Счёт-фактура"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1254,7 +1281,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1265,7 +1292,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1506,7 +1533,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1517,7 +1544,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1574,7 +1601,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1664,7 +1691,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1744,6 +1771,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1760,19 +1801,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1780,7 +1821,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1788,7 +1829,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1796,7 +1837,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1804,7 +1845,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/sk.po b/contract/i18n/sk.po
index fb718aa9e..2847ce1cc 100644
--- a/contract/i18n/sk.po
+++ b/contract/i18n/sk.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "Vytvorené"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/sk_SK.po b/contract/i18n/sk_SK.po
index f936e1062..41c576c44 100644
--- a/contract/i18n/sk_SK.po
+++ b/contract/i18n/sk_SK.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -344,7 +344,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -393,7 +393,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -522,37 +522,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -562,7 +562,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -574,7 +574,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -586,7 +586,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -598,7 +598,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -609,7 +609,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -694,6 +694,13 @@ msgstr ""
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -746,6 +753,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -762,7 +780,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1144,6 +1162,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1222,7 +1247,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1233,7 +1258,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1468,7 +1493,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1479,7 +1504,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1534,7 +1559,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1623,7 +1648,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1703,6 +1728,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1719,19 +1758,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1739,7 +1778,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1747,7 +1786,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1755,7 +1794,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1763,7 +1802,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/sl.po b/contract/i18n/sl.po
index 4176ca07d..b0bd3abb3 100644
--- a/contract/i18n/sl.po
+++ b/contract/i18n/sl.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -344,7 +344,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -393,7 +393,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -522,37 +522,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -562,7 +562,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -574,7 +574,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -586,7 +586,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -598,7 +598,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -609,7 +609,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -696,6 +696,13 @@ msgstr "Ustvarjeno"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -748,6 +755,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -764,7 +782,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1152,6 +1170,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1230,7 +1255,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1241,7 +1266,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1478,7 +1503,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1489,7 +1514,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1544,7 +1569,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1633,7 +1658,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1713,6 +1738,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1729,19 +1768,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1749,7 +1788,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1757,7 +1796,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1765,7 +1804,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1773,7 +1812,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/sr.po b/contract/i18n/sr.po
index 7d96b8c94..5e96cbb31 100644
--- a/contract/i18n/sr.po
+++ b/contract/i18n/sr.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Kreiran"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1140,6 +1158,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1218,7 +1243,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1229,7 +1254,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1464,7 +1489,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1475,7 +1500,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1530,7 +1555,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1619,7 +1644,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1699,6 +1724,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1715,19 +1754,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1735,7 +1774,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1743,7 +1782,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1751,7 +1790,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1759,7 +1798,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/sr@latin.po b/contract/i18n/sr@latin.po
index 5008ccd81..bfa8a9564 100644
--- a/contract/i18n/sr@latin.po
+++ b/contract/i18n/sr@latin.po
@@ -190,19 +190,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -257,7 +257,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -341,7 +341,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -390,7 +390,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,37 +517,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -557,7 +557,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -569,7 +569,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -581,7 +581,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -593,7 +593,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -604,7 +604,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -691,6 +691,13 @@ msgstr "Kreiran"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -743,6 +750,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -759,7 +777,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/sv.po b/contract/i18n/sv.po
index 3923cf3ed..a3230002d 100644
--- a/contract/i18n/sv.po
+++ b/contract/i18n/sv.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "Skapad den"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/th.po b/contract/i18n/th.po
index d9ad41363..81a83a74d 100644
--- a/contract/i18n/th.po
+++ b/contract/i18n/th.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "สร้างเมื่อ"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1141,6 +1159,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1219,7 +1244,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1230,7 +1255,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1465,7 +1490,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1476,7 +1501,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1531,7 +1556,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1620,7 +1645,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1700,6 +1725,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1716,19 +1755,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1736,7 +1775,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1744,7 +1783,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1752,7 +1791,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1760,7 +1799,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/tr.po b/contract/i18n/tr.po
index 0ae87c6c3..0e02cc785 100644
--- a/contract/i18n/tr.po
+++ b/contract/i18n/tr.po
@@ -257,19 +257,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>Birim Fiyat</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -326,7 +326,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -416,7 +416,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -467,7 +467,7 @@ msgid "Company"
 msgstr "Firma"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "E-posta Oluştur"
@@ -615,38 +615,38 @@ msgid "Contract Type"
 msgstr "Sözleşme Şablonu"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, fuzzy, python-format
 #| msgid "Contract '%s' start date can't be later than end date"
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr "Sözleşme '%s' başlangıç tarihi, bitiş tarihinden sonra olamaz"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -656,7 +656,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -668,7 +668,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -680,7 +680,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -692,7 +692,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -705,7 +705,7 @@ msgid "Contract lines"
 msgstr "Sözleşme Satırları"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -799,6 +799,13 @@ msgstr "Oluşturuldu"
 msgid "Currency"
 msgstr "Tekrarlayan"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -852,6 +859,17 @@ msgstr "Sonraki Fatura Tarihi"
 msgid "Day(s)"
 msgstr "Gün(ler)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -868,7 +886,7 @@ msgid "Discount (%)"
 msgstr "İndirim (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "İndirim 100'den az veya ona eşit olmalıdır"
@@ -1277,6 +1295,15 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Note Invoicing Mode"
+msgstr "Fatura türü"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1359,7 +1386,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1370,7 +1397,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, fuzzy, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Lütfen '%s' firması için bir satış yevmiyesi tanımlayın."
@@ -1623,7 +1650,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1634,7 +1661,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1692,7 +1719,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1783,7 +1810,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1865,6 +1892,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr "Hafta(lar)"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1881,19 +1922,19 @@ msgid "Year(s)"
 msgstr "Yıl(lar)"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1901,7 +1942,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1909,7 +1950,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1917,7 +1958,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1925,7 +1966,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/tr_TR.po b/contract/i18n/tr_TR.po
index 6c85e01dc..57bc9eed5 100644
--- a/contract/i18n/tr_TR.po
+++ b/contract/i18n/tr_TR.po
@@ -190,19 +190,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -257,7 +257,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -346,7 +346,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -395,7 +395,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -536,37 +536,37 @@ msgid "Contract Type"
 msgstr "Sözleşme"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -576,7 +576,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -588,7 +588,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -600,7 +600,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -612,7 +612,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -625,7 +625,7 @@ msgid "Contract lines"
 msgstr "Sözleşmeler"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -714,6 +714,13 @@ msgstr "Oluşturulma"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -767,6 +774,17 @@ msgstr "Sonraki Fatura Tarihi"
 msgid "Day(s)"
 msgstr "Gün(ler)"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -783,7 +801,7 @@ msgid "Discount (%)"
 msgstr "İndirim (%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "İndirim 100'den az veya ona eşit olmalıdır"
@@ -1190,6 +1208,15 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Note Invoicing Mode"
+msgstr "Fatura türü"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1270,7 +1297,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1281,7 +1308,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, fuzzy, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "Lütfen '%s' şirketi için bir satış yevmiyesi tanımlayın."
@@ -1528,7 +1555,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1539,7 +1566,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1596,7 +1623,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1686,7 +1713,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1766,6 +1793,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr "Hafta(lar)"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1782,19 +1823,19 @@ msgid "Year(s)"
 msgstr "Yıl(lar)"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1802,7 +1843,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1810,7 +1851,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1818,7 +1859,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1826,7 +1867,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/uk.po b/contract/i18n/uk.po
index 14e906d63..da5a86fe6 100644
--- a/contract/i18n/uk.po
+++ b/contract/i18n/uk.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Створено"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/vi.po b/contract/i18n/vi.po
index 762920964..239104fba 100644
--- a/contract/i18n/vi.po
+++ b/contract/i18n/vi.po
@@ -188,19 +188,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -339,7 +339,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -388,7 +388,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -515,37 +515,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -567,7 +567,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -579,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -591,7 +591,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -602,7 +602,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -689,6 +689,13 @@ msgstr "Tạo trên"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -741,6 +748,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -757,7 +775,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1139,6 +1157,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1217,7 +1242,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1228,7 +1253,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1463,7 +1488,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1474,7 +1499,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1529,7 +1554,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1618,7 +1643,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1698,6 +1723,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1714,19 +1753,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1734,7 +1773,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1742,7 +1781,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1750,7 +1789,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1758,7 +1797,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/vi_VN.po b/contract/i18n/vi_VN.po
index 841d016e4..09f5c8b40 100644
--- a/contract/i18n/vi_VN.po
+++ b/contract/i18n/vi_VN.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "Tạo vào"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1142,6 +1160,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1220,7 +1245,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1231,7 +1256,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1466,7 +1491,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1477,7 +1502,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1532,7 +1557,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1621,7 +1646,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1701,6 +1726,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1717,19 +1756,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1737,7 +1776,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1745,7 +1784,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1753,7 +1792,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1761,7 +1800,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/i18n/zh_CN.po b/contract/i18n/zh_CN.po
index a78d3c462..7dc0f521b 100644
--- a/contract/i18n/zh_CN.po
+++ b/contract/i18n/zh_CN.po
@@ -253,19 +253,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr "<strong>单价</strong>"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr "已取消的合同行无法设置为自动续订"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr "与接替的合同行不能设置为自动更新"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr "与接替的合同行必须有结束日期"
@@ -320,7 +320,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr "自动续订行必须有结束日期"
@@ -412,7 +412,7 @@ msgid "Cancel allowed?"
 msgstr "取消允许？"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr "取消此行不允许"
@@ -463,7 +463,7 @@ msgid "Company"
 msgstr "公司"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "编写Email"
@@ -604,37 +604,37 @@ msgid "Contract Type"
 msgstr "合同类型"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr "合同行'%s'的开始日期不能晚于结束日期"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr "合同行未取消：%s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr "与其原先合同行重叠"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr "与接替的合同行重叠"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr "合同行取消：%s<br/>- "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -648,7 +648,7 @@ msgstr ""
 "                            "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -666,7 +666,7 @@ msgstr ""
 "                    "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -684,7 +684,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -702,7 +702,7 @@ msgstr ""
 "                "
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr "必须在删除前取消合同行"
@@ -713,7 +713,7 @@ msgid "Contract lines"
 msgstr "合同行"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -805,6 +805,15 @@ msgstr "创建时间"
 msgid "Currency"
 msgstr "货币"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+#, fuzzy
+#| msgid "Customer"
+msgid "Custom"
+msgstr "客户"
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -857,6 +866,17 @@ msgstr "下一个发票的日期"
 msgid "Day(s)"
 msgstr "天"
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -873,7 +893,7 @@ msgid "Discount (%)"
 msgstr "折扣(%)"
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr "折扣应小于或等于100"
@@ -1265,6 +1285,15 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+#, fuzzy
+#| msgid "Invoicing type"
+msgid "Note Invoicing Mode"
+msgstr "发票类型"
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1343,7 +1372,7 @@ msgid "Plan successor allowed?"
 msgstr "计划接替允许吗？"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr "计划接替不允许此行"
@@ -1354,7 +1383,7 @@ msgid "Planned"
 msgstr "计划"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr "请为定义一个%s日记账，公司 '%s'。"
@@ -1595,7 +1624,7 @@ msgid "Stop allowed?"
 msgstr "停止允许？"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr "停止不允许此行"
@@ -1606,7 +1635,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr "允许停止/计划接替？"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr "此线路不允许停止/计划接替"
@@ -1661,7 +1690,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, fuzzy, python-format
@@ -1761,7 +1790,7 @@ msgid "Un-cancel"
 msgstr "不要取消"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr "此行不允许取消"
@@ -1841,6 +1870,20 @@ msgstr "网站沟通记录"
 msgid "Week(s)"
 msgstr "周"
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1857,19 +1900,19 @@ msgid "Year(s)"
 msgstr "年"
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr "您不能延迟至少一次开具发票的合同行。"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1877,7 +1920,7 @@ msgid ""
 msgstr "在合同行'%s'开头之前，您不能拥有下一张发票的日期"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1885,7 +1928,7 @@ msgid ""
 msgstr "您不能在合同行'%s'的最后一张发票日期之前有结束日期"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, fuzzy, python-format
 #| msgid ""
 #| "You can't have the end date before the date of last invoice for the "
@@ -1896,7 +1939,7 @@ msgid ""
 msgstr "您不能在合同行'%s'的最后一张发票日期之前有结束日期"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1904,7 +1947,7 @@ msgid ""
 msgstr "在合同行'%s'的最后一张发票日期之后，您不能拥有开始日期"
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr "您必须为合同行'%s'提供下一张发票的日期"
diff --git a/contract/i18n/zh_TW.po b/contract/i18n/zh_TW.po
index 11b7c2bd5..9abcb508d 100644
--- a/contract/i18n/zh_TW.po
+++ b/contract/i18n/zh_TW.po
@@ -189,19 +189,19 @@ msgid "<strong>Unit Price</strong>"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:573
+#: code:addons/contract/models/contract_line.py:574
 #, python-format
 msgid "A canceled contract line can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:347
+#: code:addons/contract/models/contract_line.py:348
 #, python-format
 msgid "A contract line with a successor can't be set to auto-renew"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:359
+#: code:addons/contract/models/contract_line.py:360
 #, python-format
 msgid "A contract line with a successor must have a end date"
 msgstr ""
@@ -256,7 +256,7 @@ msgid "Add a section"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:354
+#: code:addons/contract/models/contract_line.py:355
 #, python-format
 msgid "An auto-renew line must have a end date"
 msgstr ""
@@ -340,7 +340,7 @@ msgid "Cancel allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1080
+#: code:addons/contract/models/contract_line.py:1082
 #, python-format
 msgid "Cancel not allowed for this line"
 msgstr ""
@@ -389,7 +389,7 @@ msgid "Company"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,37 +516,37 @@ msgid "Contract Type"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:644
+#: code:addons/contract/models/contract_line.py:645
 #, python-format
 msgid "Contract line '%s' start date can't be later than end date"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1109
+#: code:addons/contract/models/contract_line.py:1111
 #, python-format
 msgid "Contract line Un-canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:380
+#: code:addons/contract/models/contract_line.py:381
 #, python-format
 msgid "Contract line and its predecessor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:371
+#: code:addons/contract/models/contract_line.py:372
 #, python-format
 msgid "Contract line and its successor overlapped"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1088
+#: code:addons/contract/models/contract_line.py:1090
 #, python-format
 msgid "Contract line canceled: %s<br/>- "
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:880
+#: code:addons/contract/models/contract_line.py:882
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -556,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:960
+#: code:addons/contract/models/contract_line.py:962
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -568,7 +568,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1256
+#: code:addons/contract/models/contract_line.py:1258
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -580,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1068
+#: code:addons/contract/models/contract_line.py:1070
 #, python-format
 msgid ""
 "Contract line for <strong>{product}</strong>\n"
@@ -592,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1308
+#: code:addons/contract/models/contract_line.py:1310
 #, python-format
 msgid "Contract line must be canceled before delete"
 msgstr ""
@@ -603,7 +603,7 @@ msgid "Contract lines"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:463
+#: code:addons/contract/models/contract.py:488
 #, python-format
 msgid ""
 "Contract manually invoiced: <a href=\"#\" data-oe-model=\"%s\" data-oe-id="
@@ -690,6 +690,13 @@ msgstr "建立於"
 msgid "Currency"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "Custom"
+msgstr ""
+
 #. module: contract
 #: selection:contract.abstract.contract,contract_type:0
 #: selection:contract.contract,contract_type:0
@@ -742,6 +749,17 @@ msgstr ""
 msgid "Day(s)"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,help:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,help:contract.field_contract_template_line__note_invoicing_mode
+msgid ""
+"Defines when the Note is invoiced:\n"
+"- With previous line: If the previous line can be invoiced.\n"
+"- With next line: If the next line can be invoiced.\n"
+"- Custom: Depending on the recurrence to be define."
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__name
 #: model:ir.model.fields,field_description:contract.field_contract_line__name
@@ -758,7 +776,7 @@ msgid "Discount (%)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/abstract_contract_line.py:208
+#: code:addons/contract/models/abstract_contract_line.py:233
 #, python-format
 msgid "Discount should be less or equal to 100"
 msgstr ""
@@ -1140,6 +1158,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: contract
+#: model:ir.model.fields,field_description:contract.field_contract_abstract_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_line__note_invoicing_mode
+#: model:ir.model.fields,field_description:contract.field_contract_template_line__note_invoicing_mode
+msgid "Note Invoicing Mode"
+msgstr ""
+
 #. module: contract
 #: model:ir.model.fields,field_description:contract.field_contract_contract__note
 msgid "Notes"
@@ -1218,7 +1243,7 @@ msgid "Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:943
+#: code:addons/contract/models/contract_line.py:945
 #, python-format
 msgid "Plan successor not allowed for this line"
 msgstr ""
@@ -1229,7 +1254,7 @@ msgid "Planned"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:298
+#: code:addons/contract/models/contract.py:299
 #, python-format
 msgid "Please define a %s journal for the company '%s'."
 msgstr ""
@@ -1464,7 +1489,7 @@ msgid "Stop allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:863
+#: code:addons/contract/models/contract_line.py:865
 #, python-format
 msgid "Stop not allowed for this line"
 msgstr ""
@@ -1475,7 +1500,7 @@ msgid "Stop/Plan successor allowed?"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1004
+#: code:addons/contract/models/contract_line.py:1006
 #, python-format
 msgid "Stop/Plan successor not allowed for this line"
 msgstr ""
@@ -1530,7 +1555,7 @@ msgid "Technical field for UX purpose."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:491
+#: code:addons/contract/models/contract.py:516
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_form_view
 #: model_terms:ir.ui.view,arch_db:contract.contract_contract_terminate_form_view
 #, python-format
@@ -1619,7 +1644,7 @@ msgid "Un-cancel"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:1101
+#: code:addons/contract/models/contract_line.py:1103
 #, python-format
 msgid "Un-cancel not allowed for this line"
 msgstr ""
@@ -1699,6 +1724,20 @@ msgstr ""
 msgid "Week(s)"
 msgstr ""
 
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With next line"
+msgstr ""
+
+#. module: contract
+#: selection:contract.abstract.contract.line,note_invoicing_mode:0
+#: selection:contract.line,note_invoicing_mode:0
+#: selection:contract.template.line,note_invoicing_mode:0
+msgid "With previous line"
+msgstr ""
+
 #. module: contract
 #: model_terms:ir.ui.view,arch_db:contract.view_res_partner_filter
 msgid "With running contracts"
@@ -1715,19 +1754,19 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract.py:505
+#: code:addons/contract/models/contract.py:530
 #, python-format
 msgid "You are not allowed to terminate contracts."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:813
+#: code:addons/contract/models/contract_line.py:815
 #, python-format
 msgid "You can't delay a contract line invoiced at least one time."
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:582
+#: code:addons/contract/models/contract_line.py:583
 #, python-format
 msgid ""
 "You can't have a date of next invoice anterior to the start of the contract "
@@ -1735,7 +1774,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:604
+#: code:addons/contract/models/contract_line.py:605
 #, python-format
 msgid ""
 "You can't have the end date before the date of last invoice for the contract "
@@ -1743,7 +1782,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:615
+#: code:addons/contract/models/contract_line.py:616
 #, python-format
 msgid ""
 "You can't have the next invoice date before the date of last invoice for the "
@@ -1751,7 +1790,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:596
+#: code:addons/contract/models/contract_line.py:597
 #, python-format
 msgid ""
 "You can't have the start date after the date of last invoice for the "
@@ -1759,7 +1798,7 @@ msgid ""
 msgstr ""
 
 #. module: contract
-#: code:addons/contract/models/contract_line.py:631
+#: code:addons/contract/models/contract_line.py:632
 #, python-format
 msgid "You must supply a date of next invoice for contract line '%s'"
 msgstr ""
diff --git a/contract/models/abstract_contract_line.py b/contract/models/abstract_contract_line.py
index 6624f3371..a1ed154dc 100644
--- a/contract/models/abstract_contract_line.py
+++ b/contract/models/abstract_contract_line.py
@@ -125,9 +125,27 @@ class ContractAbstractContractLine(models.AbstractModel):
         required=True,
         ondelete='cascade',
     )
-    display_type = fields.Selection([
-        ('line_section', "Section"),
-        ('line_note', "Note")], default=False, help="Technical field for UX purpose.")
+    display_type = fields.Selection(
+        selection=[
+            ('line_section', "Section"),
+            ('line_note', "Note"),
+        ],
+        default=False,
+        help="Technical field for UX purpose."
+    )
+    note_invoicing_mode = fields.Selection(
+        selection=[
+            ('with_previous_line', 'With previous line'),
+            ('with_next_line', 'With next line'),
+            ('custom', 'Custom'),
+        ],
+        default='with_previous_line',
+        help="Defines when the Note is invoiced:\n"
+             "- With previous line: If the previous line can be invoiced.\n"
+             "- With next line: If the next line can be invoiced.\n"
+             "- Custom: Depending on the recurrence to be define."
+    )
+    is_recurring_note = fields.Boolean(compute="_compute_is_recurring_note")
 
     @api.model
     def _get_default_recurring_invoicing_offset(
@@ -141,6 +159,13 @@ class ContractAbstractContractLine(models.AbstractModel):
         else:
             return 1
 
+    def is_recurring_note(self):
+        for record in self:
+            record.is_recurring_note = (
+                record.display_type == 'line_note'
+                and record.note_invoicing_mode == 'custom'
+            )
+
     @api.depends('recurring_invoicing_type', 'recurring_rule_type')
     def _compute_recurring_invoicing_offset(self):
         for rec in self:
diff --git a/contract/models/contract.py b/contract/models/contract.py
index ea007c2c0..a9199ba83 100644
--- a/contract/models/contract.py
+++ b/contract/models/contract.py
@@ -194,7 +194,8 @@ class ContractContract(models.Model):
     def _compute_recurring_next_date(self):
         for contract in self:
             recurring_next_date = contract.contract_line_ids.filtered(
-                lambda l: l.recurring_next_date and not l.is_canceled
+                lambda l: (l.recurring_next_date and not l.is_canceled
+                           and (not l.display_type or l.is_recurring_note))
             ).mapped('recurring_next_date')
             if recurring_next_date:
                 contract.recurring_next_date = min(recurring_next_date)
@@ -412,11 +413,35 @@ class ContractContract(models.Model):
         :return: contract lines (contract.line recordset)
         """
         self.ensure_one()
-        return self.contract_line_ids.filtered(
-            lambda l: not l.is_canceled
-            and l.recurring_next_date
-            and l.recurring_next_date <= date_ref
-        )
+
+        def can_be_invoiced(l):
+            return (not l.is_canceled and l.recurring_next_date
+                    and l.recurring_next_date <= date_ref)
+
+        lines2invoice = previous = self.env['contract.line']
+        current_section = current_note = False
+        for line in self.contract_line_ids:
+            if line.display_type == 'line_section':
+                current_section = line
+            elif (line.display_type == 'line_note' and
+                    not line.is_recurring_note):
+                if line.note_invoicing_mode == "with_previous_line":
+                    if previous in lines2invoice:
+                        lines2invoice |= line
+                    current_note = False
+                elif line.note_invoicing_mode == "with_next_line":
+                    current_note = line
+            elif line.is_recurring_note or not line.display_type:
+                if can_be_invoiced(line):
+                    if current_section:
+                        lines2invoice |= current_section
+                        current_section = False
+                    if current_note:
+                        lines2invoice |= current_note
+                    lines2invoice |= line
+                    current_note = False
+            previous = line
+        return lines2invoice.sorted()
 
     @api.multi
     def _prepare_recurring_invoices_values(self, date_ref=False):
diff --git a/contract/models/contract_line.py b/contract/models/contract_line.py
index 011cdc4bd..e5074d654 100644
--- a/contract/models/contract_line.py
+++ b/contract/models/contract_line.py
@@ -15,6 +15,7 @@ class ContractLine(models.Model):
     _name = 'contract.line'
     _description = "Contract Line"
     _inherit = 'contract.abstract.contract.line'
+    _order = 'sequence,id'
 
     sequence = fields.Integer(
         string="Sequence",
@@ -654,8 +655,8 @@ class ContractLine(models.Model):
         # have no meaning in certain invoices
         today = fields.Date.context_today(self)
         for rec in self:
-            if (not rec.display_type and
-                    rec.date_start and today >= rec.date_start):
+            if ((not rec.display_type or rec.is_recurring_note)
+                    and rec.date_start and today >= rec.date_start):
                 rec.create_invoice_visibility = bool(rec.recurring_next_date)
             else:
                 rec.create_invoice_visibility = False
@@ -691,6 +692,7 @@ class ContractLine(models.Model):
         name = self._insert_markers(dates[0], dates[1])
         invoice_line_vals.update(
             {
+                'sequence': self.sequence,
                 'name': name,
                 'account_analytic_id': self.analytic_account_id.id,
                 'analytic_tag_ids': [(6, 0, self.analytic_tag_ids.ids)],
diff --git a/contract/views/abstract_contract_line.xml b/contract/views/abstract_contract_line.xml
index d4c7d3d02..44feec0a6 100644
--- a/contract/views/abstract_contract_line.xml
+++ b/contract/views/abstract_contract_line.xml
@@ -34,6 +34,10 @@
                     <label for="name" string="Note" attrs="{'invisible': [('display_type', '!=', 'line_note')]}"/>
                     <field name="name" nolabel="1"/>
 
+                    <group name="note_invoicing_mode" attrs="{'invisible': [('display_type', '!=', 'line_note')]}">
+                        <field name="note_invoicing_mode" widget="radio"/>
+                    </group>
+
                     <group col="4" attrs="{'invisible': [('display_type', '!=', False)]}">
                         <field colspan="2" name="is_auto_renew"/>
                         <field colspan="2" name="is_canceled" invisible="1"/>
@@ -62,7 +66,7 @@
                             </div>
                         </group>
                     </group>
-                    <group name="recurrence_info" attrs="{'invisible': [('display_type', '!=', False)]}">
+                    <group name="recurrence_info" attrs="{'invisible': ['|', ('display_type', '=', 'line_section'), '&amp;', ('display_type', '=', 'line_note'), ('note_invoicing_mode', '!=', 'custom')]}">
                         <group>
                             <label for="recurring_interval"/>
                             <div class="o_row">