diff --git a/contract/i18n/contract.pot b/contract/i18n/contract.pot
index e3c6bd757..c8df43b12 100644
--- a/contract/i18n/contract.pot
+++ b/contract/i18n/contract.pot
@@ -168,18 +168,21 @@ 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 ""
@@ -235,6 +238,7 @@ 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 ""
@@ -319,6 +323,7 @@ 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 ""
@@ -368,6 +373,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -495,36 +501,42 @@ 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"
@@ -534,6 +546,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"
 "                    planned a successor: <br/>\n"
@@ -545,6 +558,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"
 "                renewed: <br/>\n"
@@ -556,6 +570,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"
 "                suspended: <br/>\n"
@@ -567,6 +582,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 ""
@@ -578,6 +594,7 @@ 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 +677,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 +736,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
@@ -729,6 +763,7 @@ 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 +1135,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"
@@ -1177,6 +1219,7 @@ 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 ""
@@ -1188,6 +1231,7 @@ 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 ""
@@ -1420,6 +1464,7 @@ 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 ""
@@ -1431,6 +1476,7 @@ 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 ""
@@ -1486,6 +1532,7 @@ 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
@@ -1573,6 +1620,7 @@ 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 +1700,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"
@@ -1669,42 +1731,49 @@ 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 ""