diff --git a/contract/i18n/am.po b/contract/i18n/am.po
index 70087bf63..0056a0d56 100644
--- a/contract/i18n/am.po
+++ b/contract/i18n/am.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..173425969 100644
--- a/contract/i18n/ar.po
+++ b/contract/i18n/ar.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..887e69d03 100644
--- a/contract/i18n/bg.po
+++ b/contract/i18n/bg.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1468,6 +1513,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 ""
@@ -1479,6 +1525,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 ""
@@ -1534,6 +1581,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
@@ -1623,6 +1671,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 ""
@@ -1702,6 +1751,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,18 +1782,21 @@ 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,6 +1805,7 @@ 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,6 +1814,7 @@ 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,6 +1823,7 @@ 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,6 +1832,7 @@ 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..8c9495b6b 100644
--- a/contract/i18n/bs.po
+++ b/contract/i18n/bs.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1140,6 +1176,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,6 +1262,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 ""
@@ -1230,6 +1274,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 ""
@@ -1465,6 +1510,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 ""
@@ -1476,6 +1522,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 ""
@@ -1531,6 +1578,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
@@ -1620,6 +1668,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 ""
@@ -1699,6 +1748,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,18 +1779,21 @@ 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,6 +1802,7 @@ 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,6 +1811,7 @@ 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,6 +1820,7 @@ 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,6 +1829,7 @@ 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..19afa53be 100644
--- a/contract/i18n/ca.po
+++ b/contract/i18n/ca.po
@@ -260,18 +260,21 @@ 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 ""
@@ -327,6 +330,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 ""
@@ -419,6 +423,7 @@ 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 ""
@@ -470,6 +475,7 @@ 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"
@@ -609,6 +615,7 @@ 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 ""
@@ -616,30 +623,35 @@ 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"
@@ -650,6 +662,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"
@@ -662,6 +675,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"
@@ -674,6 +688,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"
@@ -686,6 +701,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ínia de Contracte ha de ser cancel·lada abans d'esborrar-la"
@@ -697,6 +713,7 @@ 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 +803,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 +864,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
@@ -855,6 +892,7 @@ 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 +1284,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"
@@ -1325,6 +1372,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 ""
@@ -1336,6 +1384,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 "Si us plau estableixi un %s diari per a l'empresa '%s'."
@@ -1573,6 +1622,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 ""
@@ -1584,6 +1634,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 ""
@@ -1639,6 +1690,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
 #, fuzzy, python-format
@@ -1731,6 +1783,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 ""
@@ -1810,6 +1863,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"
@@ -1827,18 +1894,21 @@ 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 "
@@ -1847,6 +1917,7 @@ 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 "
@@ -1855,6 +1926,7 @@ 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 "
@@ -1863,6 +1935,7 @@ 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 "
@@ -1871,6 +1944,7 @@ 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..bf277fc30 100644
--- a/contract/i18n/cs.po
+++ b/contract/i18n/cs.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..a36b6f006 100644
--- a/contract/i18n/da.po
+++ b/contract/i18n/da.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..01297318d 100644
--- a/contract/i18n/de.po
+++ b/contract/i18n/de.po
@@ -258,6 +258,7 @@ 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 ""
@@ -265,6 +266,7 @@ 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 ""
@@ -273,6 +275,7 @@ 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 "Eine Vertragszeile mit einem Nachfolger muss ein Enddatum haben."
@@ -330,6 +333,7 @@ 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"
@@ -414,6 +418,7 @@ 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."
@@ -463,6 +468,7 @@ 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"
@@ -600,36 +606,42 @@ 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"
@@ -644,6 +656,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"
@@ -662,6 +675,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"
@@ -680,6 +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"
@@ -698,6 +713,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 ""
@@ -710,13 +726,14 @@ 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 +816,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 +877,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
@@ -868,6 +905,7 @@ 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 +1303,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"
@@ -1344,6 +1391,7 @@ 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"
@@ -1355,6 +1403,7 @@ 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."
@@ -1594,6 +1643,7 @@ 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"
@@ -1605,6 +1655,7 @@ 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"
@@ -1660,6 +1711,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
@@ -1751,6 +1803,7 @@ 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 +1883,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"
@@ -1847,12 +1914,14 @@ 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 ""
@@ -1861,6 +1930,7 @@ 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 "
@@ -1871,6 +1941,7 @@ 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 "
@@ -1881,6 +1952,7 @@ msgstr ""
 
 #. 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 "
@@ -1894,6 +1966,7 @@ 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 "
@@ -1904,6 +1977,7 @@ 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/el_GR.po b/contract/i18n/el_GR.po
index 5fdf93a87..4eb949871 100644
--- a/contract/i18n/el_GR.po
+++ b/contract/i18n/el_GR.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -345,6 +349,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 ""
@@ -394,6 +399,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -523,36 +529,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"
@@ -563,6 +575,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"
@@ -575,6 +588,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"
@@ -587,6 +601,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"
@@ -599,6 +614,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 ""
@@ -610,6 +626,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="
@@ -696,6 +713,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 +772,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,6 +800,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 ""
@@ -1148,6 +1184,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"
@@ -1227,6 +1270,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 ""
@@ -1238,6 +1282,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 ""
@@ -1473,6 +1518,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 ""
@@ -1484,6 +1530,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 ""
@@ -1539,6 +1586,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
@@ -1628,6 +1676,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 ""
@@ -1707,6 +1756,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"
@@ -1724,18 +1787,21 @@ 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 "
@@ -1744,6 +1810,7 @@ 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 "
@@ -1752,6 +1819,7 @@ 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 "
@@ -1760,6 +1828,7 @@ 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 "
@@ -1768,6 +1837,7 @@ 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..0cbf1b79a 100644
--- a/contract/i18n/en_GB.po
+++ b/contract/i18n/en_GB.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..6a61ee870 100644
--- a/contract/i18n/es.po
+++ b/contract/i18n/es.po
@@ -268,18 +268,21 @@ 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"
@@ -335,6 +338,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 ""
@@ -420,6 +424,7 @@ 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"
@@ -469,6 +474,7 @@ 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"
@@ -598,6 +604,7 @@ 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 ""
@@ -606,30 +613,35 @@ 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 "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"
@@ -644,6 +656,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"
@@ -662,6 +675,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"
@@ -680,6 +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"
@@ -698,6 +713,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"
@@ -709,6 +725,7 @@ 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 +817,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 +878,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
@@ -869,6 +906,7 @@ 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 +1309,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"
@@ -1352,6 +1399,7 @@ 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"
@@ -1363,6 +1411,7 @@ 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'."
@@ -1606,6 +1655,7 @@ 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"
@@ -1617,6 +1667,7 @@ 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"
@@ -1672,6 +1723,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
 #, fuzzy, python-format
@@ -1775,6 +1827,7 @@ 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 +1907,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"
@@ -1871,18 +1938,21 @@ 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 "
@@ -1893,6 +1963,7 @@ 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 "
@@ -1903,6 +1974,7 @@ 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 "
@@ -1913,6 +1985,7 @@ 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 "
@@ -1923,6 +1996,7 @@ 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_AR.po b/contract/i18n/es_AR.po
index 30c0e1896..dafa20ff4 100644
--- a/contract/i18n/es_AR.po
+++ b/contract/i18n/es_AR.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..4f1d48368 100644
--- a/contract/i18n/es_CL.po
+++ b/contract/i18n/es_CL.po
@@ -250,18 +250,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 ""
@@ -317,6 +320,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 ""
@@ -401,6 +405,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 ""
@@ -450,6 +455,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -577,36 +583,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"
@@ -617,6 +629,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"
@@ -629,6 +642,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"
@@ -641,6 +655,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"
@@ -653,6 +668,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 ""
@@ -664,6 +680,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="
@@ -748,6 +765,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 +824,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
@@ -817,6 +852,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 ""
@@ -1198,6 +1234,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"
@@ -1277,6 +1320,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 ""
@@ -1288,6 +1332,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 ""
@@ -1523,6 +1568,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 ""
@@ -1534,6 +1580,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 ""
@@ -1589,6 +1636,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
@@ -1678,6 +1726,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 ""
@@ -1757,6 +1806,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"
@@ -1774,18 +1837,21 @@ 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 "
@@ -1794,6 +1860,7 @@ 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 "
@@ -1802,6 +1869,7 @@ 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 "
@@ -1810,6 +1878,7 @@ 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 "
@@ -1818,6 +1887,7 @@ 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..d517d8041 100644
--- a/contract/i18n/es_CO.po
+++ b/contract/i18n/es_CO.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -688,6 +705,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 +764,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,6 +792,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 ""
@@ -1138,6 +1174,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,6 +1260,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 ""
@@ -1228,6 +1272,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 ""
@@ -1463,6 +1508,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 ""
@@ -1474,6 +1520,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 ""
@@ -1529,6 +1576,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
@@ -1618,6 +1666,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 ""
@@ -1697,6 +1746,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,18 +1777,21 @@ 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,6 +1800,7 @@ 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,6 +1809,7 @@ 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,6 +1818,7 @@ 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,6 +1827,7 @@ 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..463c6f4e2 100644
--- a/contract/i18n/es_CR.po
+++ b/contract/i18n/es_CR.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..6a066ad4a 100644
--- a/contract/i18n/es_DO.po
+++ b/contract/i18n/es_DO.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -688,6 +705,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 +764,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,6 +792,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 ""
@@ -1138,6 +1174,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,6 +1260,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 ""
@@ -1228,6 +1272,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 ""
@@ -1463,6 +1508,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 ""
@@ -1474,6 +1520,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 ""
@@ -1529,6 +1576,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
@@ -1618,6 +1666,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 ""
@@ -1697,6 +1746,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,18 +1777,21 @@ 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,6 +1800,7 @@ 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,6 +1809,7 @@ 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,6 +1818,7 @@ 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,6 +1827,7 @@ 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..b1a31fc7b 100644
--- a/contract/i18n/es_EC.po
+++ b/contract/i18n/es_EC.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -688,6 +705,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 +764,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,6 +792,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 ""
@@ -1138,6 +1174,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,6 +1260,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 ""
@@ -1228,6 +1272,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 ""
@@ -1463,6 +1508,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 ""
@@ -1474,6 +1520,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 ""
@@ -1529,6 +1576,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
@@ -1618,6 +1666,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 ""
@@ -1697,6 +1746,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,18 +1777,21 @@ 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,6 +1800,7 @@ 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,6 +1809,7 @@ 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,6 +1818,7 @@ 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,6 +1827,7 @@ 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..e100794d8 100644
--- a/contract/i18n/es_ES.po
+++ b/contract/i18n/es_ES.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..a05397df7 100644
--- a/contract/i18n/es_MX.po
+++ b/contract/i18n/es_MX.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -345,6 +349,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 ""
@@ -394,6 +399,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -523,36 +529,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"
@@ -563,6 +575,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"
@@ -575,6 +588,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"
@@ -587,6 +601,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"
@@ -599,6 +614,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 ""
@@ -610,6 +626,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="
@@ -696,6 +713,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 +772,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,6 +800,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 ""
@@ -1148,6 +1184,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"
@@ -1227,6 +1270,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 ""
@@ -1238,6 +1282,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 ""
@@ -1473,6 +1518,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 ""
@@ -1484,6 +1530,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 ""
@@ -1539,6 +1586,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
@@ -1628,6 +1676,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 ""
@@ -1707,6 +1756,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"
@@ -1724,18 +1787,21 @@ 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 "
@@ -1744,6 +1810,7 @@ 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 "
@@ -1752,6 +1819,7 @@ 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 "
@@ -1760,6 +1828,7 @@ 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 "
@@ -1768,6 +1837,7 @@ 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..0774f2bfd 100644
--- a/contract/i18n/es_PY.po
+++ b/contract/i18n/es_PY.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -688,6 +705,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 +764,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,6 +792,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 ""
@@ -1138,6 +1174,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,6 +1260,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 ""
@@ -1228,6 +1272,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 ""
@@ -1463,6 +1508,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 ""
@@ -1474,6 +1520,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 ""
@@ -1529,6 +1576,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
@@ -1618,6 +1666,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 ""
@@ -1697,6 +1746,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,18 +1777,21 @@ 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,6 +1800,7 @@ 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,6 +1809,7 @@ 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,6 +1818,7 @@ 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,6 +1827,7 @@ 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..dc0dc3919 100644
--- a/contract/i18n/es_VE.po
+++ b/contract/i18n/es_VE.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..27aa3c9b5 100644
--- a/contract/i18n/et.po
+++ b/contract/i18n/et.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1139,6 +1175,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,6 +1261,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 ""
@@ -1229,6 +1273,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 ""
@@ -1464,6 +1509,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 ""
@@ -1475,6 +1521,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 ""
@@ -1530,6 +1577,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
@@ -1619,6 +1667,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 ""
@@ -1698,6 +1747,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,18 +1778,21 @@ 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,6 +1801,7 @@ 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,6 +1810,7 @@ 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,6 +1819,7 @@ 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,6 +1828,7 @@ 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..e277634bf 100644
--- a/contract/i18n/eu.po
+++ b/contract/i18n/eu.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -687,6 +704,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 +763,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,6 +791,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 ""
@@ -1137,6 +1173,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,6 +1259,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 ""
@@ -1227,6 +1271,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 ""
@@ -1462,6 +1507,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 ""
@@ -1473,6 +1519,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 ""
@@ -1528,6 +1575,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
@@ -1617,6 +1665,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 ""
@@ -1696,6 +1745,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,18 +1776,21 @@ 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,6 +1799,7 @@ 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,6 +1808,7 @@ 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,6 +1817,7 @@ 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,6 +1826,7 @@ 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..f46f27c54 100644
--- a/contract/i18n/fa.po
+++ b/contract/i18n/fa.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..a83fea97e 100644
--- a/contract/i18n/fi.po
+++ b/contract/i18n/fi.po
@@ -261,12 +261,14 @@ 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 ""
@@ -275,6 +277,7 @@ 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 "Jos sopimusrivillä on seuraaja, sillä täytyy olla päättymispäivä"
@@ -330,6 +333,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 "Automaattisesti uusittavalla rivillä täytyy olla päättymispäivä"
@@ -422,6 +426,7 @@ 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"
@@ -471,6 +476,7 @@ 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"
@@ -604,36 +610,42 @@ 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"
@@ -647,6 +659,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,6 +678,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,6 +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"
@@ -701,6 +716,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"
@@ -712,6 +728,7 @@ 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 +817,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 +878,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
@@ -869,6 +906,7 @@ 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 +1298,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"
@@ -1341,6 +1388,7 @@ 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"
@@ -1352,6 +1400,7 @@ 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'."
@@ -1595,6 +1644,7 @@ 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"
@@ -1606,6 +1656,7 @@ 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"
@@ -1661,6 +1712,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
 #, fuzzy, python-format
@@ -1763,6 +1815,7 @@ 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 +1895,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"
@@ -1859,18 +1926,21 @@ 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 "
@@ -1880,6 +1950,7 @@ 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 "
@@ -1889,6 +1960,7 @@ 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 "
@@ -1899,6 +1971,7 @@ 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 "
@@ -1907,6 +1980,7 @@ 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..19b174056 100644
--- a/contract/i18n/fr.po
+++ b/contract/i18n/fr.po
@@ -271,6 +271,7 @@ 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 ""
@@ -278,6 +279,7 @@ 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 ""
@@ -286,6 +288,7 @@ 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 "Une ligne de contrat vouée à être succédée doit avoir une date de fin"
@@ -341,6 +344,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 "Une ligne auto-renouvelable doit avoir une date de fin"
@@ -425,6 +429,7 @@ 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"
@@ -474,6 +479,7 @@ 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"
@@ -603,6 +609,7 @@ 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 ""
@@ -610,30 +617,35 @@ 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 "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"
@@ -648,6 +660,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,6 +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"
@@ -684,6 +698,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"
@@ -703,6 +718,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"
@@ -714,6 +730,7 @@ 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 +817,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 +878,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
@@ -869,6 +906,7 @@ 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 +1304,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"
@@ -1347,6 +1394,7 @@ 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"
@@ -1358,6 +1406,7 @@ 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'."
@@ -1601,6 +1650,7 @@ 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"
@@ -1612,6 +1662,7 @@ 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"
@@ -1667,6 +1718,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
@@ -1759,6 +1811,7 @@ 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 +1891,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"
@@ -1855,12 +1922,14 @@ 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 ""
@@ -1868,6 +1937,7 @@ 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 "
@@ -1878,6 +1948,7 @@ 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 "
@@ -1888,6 +1959,7 @@ 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 "
@@ -1898,6 +1970,7 @@ 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 "
@@ -1908,6 +1981,7 @@ 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_CA.po b/contract/i18n/fr_CA.po
index 85efc4bf0..0c3ef2682 100644
--- a/contract/i18n/fr_CA.po
+++ b/contract/i18n/fr_CA.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1144,6 +1180,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"
@@ -1223,6 +1266,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 ""
@@ -1234,6 +1278,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 ""
@@ -1469,6 +1514,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 ""
@@ -1480,6 +1526,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 ""
@@ -1535,6 +1582,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
@@ -1624,6 +1672,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 ""
@@ -1703,6 +1752,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"
@@ -1720,18 +1783,21 @@ 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 "
@@ -1740,6 +1806,7 @@ 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 "
@@ -1748,6 +1815,7 @@ 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 "
@@ -1756,6 +1824,7 @@ 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 "
@@ -1764,6 +1833,7 @@ 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..e9ffbd5bc 100644
--- a/contract/i18n/fr_CH.po
+++ b/contract/i18n/fr_CH.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..5c5b016f9 100644
--- a/contract/i18n/gl.po
+++ b/contract/i18n/gl.po
@@ -254,18 +254,21 @@ 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 ""
@@ -323,6 +326,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 ""
@@ -413,6 +417,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 ""
@@ -464,6 +469,7 @@ 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"
@@ -615,6 +621,7 @@ 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"
@@ -622,30 +629,35 @@ 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"
@@ -656,6 +668,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"
@@ -668,6 +681,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"
@@ -680,6 +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"
@@ -692,6 +707,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 ""
@@ -705,6 +721,7 @@ 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 +815,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 +876,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
@@ -867,6 +904,7 @@ 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 +1316,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"
@@ -1361,6 +1408,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 ""
@@ -1372,6 +1420,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 "Por favor defina un diario de %s para a compañía '%s'."
@@ -1623,6 +1672,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 ""
@@ -1634,6 +1684,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 ""
@@ -1691,6 +1742,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
 #, fuzzy, python-format
@@ -1783,6 +1835,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 ""
@@ -1864,6 +1917,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"
@@ -1881,18 +1948,21 @@ 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'"
@@ -1905,6 +1975,7 @@ msgstr ""
 
 #. 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'"
@@ -1917,6 +1988,7 @@ msgstr ""
 
 #. 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'"
@@ -1929,6 +2001,7 @@ msgstr ""
 
 #. 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'"
@@ -1941,6 +2014,7 @@ msgstr ""
 
 #. 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..28993bdd1 100644
--- a/contract/i18n/gl_ES.po
+++ b/contract/i18n/gl_ES.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -688,6 +705,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 +764,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,6 +792,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 ""
@@ -1138,6 +1174,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,6 +1260,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 ""
@@ -1228,6 +1272,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 ""
@@ -1463,6 +1508,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 ""
@@ -1474,6 +1520,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 ""
@@ -1529,6 +1576,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
@@ -1618,6 +1666,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 ""
@@ -1697,6 +1746,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,18 +1777,21 @@ 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,6 +1800,7 @@ 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,6 +1809,7 @@ 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,6 +1818,7 @@ 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,6 +1827,7 @@ 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..7a57005b7 100644
--- a/contract/i18n/he.po
+++ b/contract/i18n/he.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..7e48719b1 100644
--- a/contract/i18n/hi_IN.po
+++ b/contract/i18n/hi_IN.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -347,6 +351,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 ""
@@ -396,6 +401,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -541,36 +547,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"
@@ -581,6 +593,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"
@@ -593,6 +606,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"
@@ -605,6 +619,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"
@@ -617,6 +632,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 ""
@@ -630,6 +646,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="
@@ -720,6 +737,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 +797,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
@@ -790,6 +825,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 ""
@@ -1185,6 +1221,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"
@@ -1266,6 +1311,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 ""
@@ -1277,6 +1323,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 ""
@@ -1518,6 +1565,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 ""
@@ -1529,6 +1577,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 ""
@@ -1586,6 +1635,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
 #, fuzzy, python-format
@@ -1676,6 +1726,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 ""
@@ -1755,6 +1806,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"
@@ -1772,18 +1837,21 @@ 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 "
@@ -1792,6 +1860,7 @@ 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 "
@@ -1800,6 +1869,7 @@ 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 "
@@ -1808,6 +1878,7 @@ 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 "
@@ -1816,6 +1887,7 @@ 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..35dd5d55b 100644
--- a/contract/i18n/hr.po
+++ b/contract/i18n/hr.po
@@ -198,18 +198,21 @@ 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 ""
@@ -265,6 +268,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 ""
@@ -354,6 +358,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 ""
@@ -403,6 +408,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -544,36 +550,42 @@ 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"
@@ -584,6 +596,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"
@@ -596,6 +609,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"
@@ -608,6 +622,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"
@@ -620,6 +635,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 ""
@@ -633,6 +649,7 @@ 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 +738,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 +798,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
@@ -791,6 +826,7 @@ 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 +1232,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"
@@ -1277,6 +1322,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 ""
@@ -1288,6 +1334,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 ""
@@ -1531,6 +1578,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 ""
@@ -1542,6 +1590,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 ""
@@ -1599,6 +1648,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
 #, fuzzy, python-format
@@ -1689,6 +1739,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 ""
@@ -1768,6 +1819,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"
@@ -1785,18 +1850,21 @@ 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 "
@@ -1805,6 +1873,7 @@ 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 "
@@ -1813,6 +1882,7 @@ 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 "
@@ -1821,6 +1891,7 @@ 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 "
@@ -1829,6 +1900,7 @@ 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..23a89f8a4 100644
--- a/contract/i18n/hr_HR.po
+++ b/contract/i18n/hr_HR.po
@@ -191,18 +191,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 ""
@@ -258,6 +261,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 ""
@@ -348,6 +352,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 ""
@@ -397,6 +402,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -542,36 +548,42 @@ 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"
@@ -582,6 +594,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"
@@ -594,6 +607,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"
@@ -606,6 +620,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"
@@ -618,6 +633,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 ""
@@ -631,6 +647,7 @@ 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 +740,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 +800,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
@@ -793,6 +828,7 @@ 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 +1236,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"
@@ -1281,6 +1326,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 ""
@@ -1292,6 +1338,7 @@ 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'."
@@ -1541,6 +1588,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 ""
@@ -1552,6 +1600,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 ""
@@ -1609,6 +1658,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
 #, fuzzy, python-format
@@ -1699,6 +1749,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 ""
@@ -1778,6 +1829,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"
@@ -1795,18 +1860,21 @@ 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 "
@@ -1815,6 +1883,7 @@ 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 "
@@ -1823,6 +1892,7 @@ 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 "
@@ -1831,6 +1901,7 @@ 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 "
@@ -1839,6 +1910,7 @@ 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..6a09201ce 100644
--- a/contract/i18n/hu.po
+++ b/contract/i18n/hu.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -344,6 +348,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 ""
@@ -393,6 +398,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -522,36 +528,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"
@@ -562,6 +574,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"
@@ -574,6 +587,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"
@@ -586,6 +600,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"
@@ -598,6 +613,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 ""
@@ -609,6 +625,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="
@@ -695,6 +712,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 +771,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,6 +799,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 ""
@@ -1147,6 +1183,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,6 +1269,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 ""
@@ -1237,6 +1281,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 ""
@@ -1472,6 +1517,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 ""
@@ -1483,6 +1529,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 ""
@@ -1538,6 +1585,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
@@ -1627,6 +1675,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 ""
@@ -1706,6 +1755,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,18 +1786,21 @@ 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,6 +1809,7 @@ 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,6 +1818,7 @@ 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,6 +1827,7 @@ 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,6 +1836,7 @@ 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..962b8d52e 100644
--- a/contract/i18n/id.po
+++ b/contract/i18n/id.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..cfac6e9b1 100644
--- a/contract/i18n/it.po
+++ b/contract/i18n/it.po
@@ -268,6 +268,7 @@ 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 ""
@@ -275,6 +276,7 @@ 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 ""
@@ -283,6 +285,7 @@ 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 "Una riga di contratto con successore deve avere una data fine"
@@ -338,6 +341,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 "Una riga di auto-rinnovo deve avere una data fine"
@@ -430,6 +434,7 @@ 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"
@@ -479,6 +484,7 @@ 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"
@@ -616,6 +622,7 @@ 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 ""
@@ -624,30 +631,35 @@ 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 "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"
@@ -662,6 +674,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"
@@ -680,6 +693,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"
@@ -698,6 +712,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"
@@ -716,6 +731,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"
@@ -727,6 +743,7 @@ 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 +835,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 +896,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
@@ -887,6 +924,7 @@ 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 +1322,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"
@@ -1363,6 +1410,7 @@ 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"
@@ -1374,6 +1422,7 @@ 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\"."
@@ -1617,6 +1666,7 @@ 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"
@@ -1628,6 +1678,7 @@ 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"
@@ -1683,6 +1734,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
 #, fuzzy, python-format
@@ -1783,6 +1835,7 @@ 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 +1915,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"
@@ -1879,12 +1946,14 @@ 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 ""
@@ -1892,6 +1961,7 @@ 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 "
@@ -1902,6 +1972,7 @@ 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 "
@@ -1912,6 +1983,7 @@ 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 "
@@ -1922,6 +1994,7 @@ 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 "
@@ -1932,6 +2005,7 @@ 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/ja.po b/contract/i18n/ja.po
index 7ea4cac7e..10a867f0f 100644
--- a/contract/i18n/ja.po
+++ b/contract/i18n/ja.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..13a6432d7 100644
--- a/contract/i18n/ko.po
+++ b/contract/i18n/ko.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..af952a070 100644
--- a/contract/i18n/lt.po
+++ b/contract/i18n/lt.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..d4d8d37ff 100644
--- a/contract/i18n/lt_LT.po
+++ b/contract/i18n/lt_LT.po
@@ -191,18 +191,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 ""
@@ -258,6 +261,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 ""
@@ -342,6 +346,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 ""
@@ -391,6 +396,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -518,36 +524,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"
@@ -558,6 +570,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"
@@ -570,6 +583,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"
@@ -582,6 +596,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"
@@ -594,6 +609,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 ""
@@ -605,6 +621,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="
@@ -691,6 +708,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 +767,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
@@ -760,6 +795,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 ""
@@ -1143,6 +1179,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,6 +1265,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 ""
@@ -1233,6 +1277,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 ""
@@ -1468,6 +1513,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 ""
@@ -1479,6 +1525,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 ""
@@ -1534,6 +1581,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
@@ -1623,6 +1671,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 ""
@@ -1702,6 +1751,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,18 +1782,21 @@ 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,6 +1805,7 @@ 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,6 +1814,7 @@ 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,6 +1823,7 @@ 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,6 +1832,7 @@ 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..135f6040b 100644
--- a/contract/i18n/lv.po
+++ b/contract/i18n/lv.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..76f4fecb3 100644
--- a/contract/i18n/mk.po
+++ b/contract/i18n/mk.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..55dfb2881 100644
--- a/contract/i18n/mn.po
+++ b/contract/i18n/mn.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..e91c2871f 100644
--- a/contract/i18n/nb.po
+++ b/contract/i18n/nb.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..26aed243c 100644
--- a/contract/i18n/nb_NO.po
+++ b/contract/i18n/nb_NO.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1144,6 +1180,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"
@@ -1223,6 +1266,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 ""
@@ -1234,6 +1278,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 ""
@@ -1469,6 +1514,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 ""
@@ -1480,6 +1526,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 ""
@@ -1535,6 +1582,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
@@ -1624,6 +1672,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 ""
@@ -1703,6 +1752,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"
@@ -1720,18 +1783,21 @@ 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 "
@@ -1740,6 +1806,7 @@ 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 "
@@ -1748,6 +1815,7 @@ 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 "
@@ -1756,6 +1824,7 @@ 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 "
@@ -1764,6 +1833,7 @@ 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..999d94f87 100644
--- a/contract/i18n/nl.po
+++ b/contract/i18n/nl.po
@@ -264,6 +264,7 @@ 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 ""
@@ -272,6 +273,7 @@ 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 ""
@@ -280,6 +282,7 @@ 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 "Een contractregel met een opvolger moet een einddatum hebben"
@@ -335,6 +338,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 "Een automatische verlengingsregel moet een einddatum hebben"
@@ -429,6 +433,7 @@ 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"
@@ -480,6 +485,7 @@ 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"
@@ -621,36 +627,42 @@ 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"
@@ -666,6 +678,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"
@@ -684,6 +697,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"
@@ -702,6 +716,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"
@@ -720,6 +735,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"
@@ -731,6 +747,7 @@ 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 +839,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 +900,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
@@ -891,6 +928,7 @@ 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 +1329,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"
@@ -1370,6 +1417,7 @@ 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"
@@ -1381,6 +1429,7 @@ 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'."
@@ -1624,6 +1673,7 @@ 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"
@@ -1635,6 +1685,7 @@ 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"
@@ -1690,6 +1741,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
 #, fuzzy, python-format
@@ -1793,6 +1845,7 @@ 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 +1925,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"
@@ -1889,12 +1956,14 @@ 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 ""
@@ -1903,6 +1972,7 @@ 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 "
@@ -1912,6 +1982,7 @@ 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 "
@@ -1922,6 +1993,7 @@ msgstr ""
 
 #. 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 "
@@ -1935,6 +2007,7 @@ 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 "
@@ -1945,6 +2018,7 @@ 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 "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..42522c825 100644
--- a/contract/i18n/nl_BE.po
+++ b/contract/i18n/nl_BE.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..9eebb70fb 100644
--- a/contract/i18n/nl_NL.po
+++ b/contract/i18n/nl_NL.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -343,6 +347,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 ""
@@ -392,6 +397,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -537,36 +543,42 @@ 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"
@@ -577,6 +589,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"
@@ -589,6 +602,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"
@@ -601,6 +615,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"
@@ -613,6 +628,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 ""
@@ -626,6 +642,7 @@ 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 +733,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 +793,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
@@ -786,6 +821,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 ""
@@ -1181,6 +1217,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"
@@ -1262,6 +1307,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 ""
@@ -1273,6 +1319,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 ""
@@ -1512,6 +1559,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 ""
@@ -1523,6 +1571,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 ""
@@ -1580,6 +1629,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
 #, fuzzy, python-format
@@ -1670,6 +1720,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 ""
@@ -1749,6 +1800,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"
@@ -1766,18 +1831,21 @@ 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 "
@@ -1786,6 +1854,7 @@ 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 "
@@ -1794,6 +1863,7 @@ 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 "
@@ -1802,6 +1872,7 @@ 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 "
@@ -1810,6 +1881,7 @@ 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..c8887bfcc 100644
--- a/contract/i18n/pl.po
+++ b/contract/i18n/pl.po
@@ -191,18 +191,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 ""
@@ -258,6 +261,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 ""
@@ -342,6 +346,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 ""
@@ -391,6 +396,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -518,36 +524,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"
@@ -558,6 +570,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"
@@ -570,6 +583,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"
@@ -582,6 +596,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"
@@ -594,6 +609,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 ""
@@ -605,6 +621,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="
@@ -691,6 +708,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 +767,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
@@ -760,6 +795,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 ""
@@ -1143,6 +1179,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,6 +1265,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 ""
@@ -1233,6 +1277,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 ""
@@ -1468,6 +1513,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 ""
@@ -1479,6 +1525,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 ""
@@ -1534,6 +1581,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
@@ -1623,6 +1671,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 ""
@@ -1702,6 +1751,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,18 +1782,21 @@ 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,6 +1805,7 @@ 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,6 +1814,7 @@ 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,6 +1823,7 @@ 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,6 +1832,7 @@ 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..a38b9f8db 100644
--- a/contract/i18n/pt.po
+++ b/contract/i18n/pt.po
@@ -271,6 +271,7 @@ 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 ""
@@ -278,6 +279,7 @@ 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 ""
@@ -286,6 +288,7 @@ 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 "Uma linha de contrato com sucessora deve ter uma data de fim"
@@ -341,6 +344,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 "Uma linha de auto-renovação deve ter uma data de fim"
@@ -433,6 +437,7 @@ 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"
@@ -482,6 +487,7 @@ 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"
@@ -615,36 +621,42 @@ 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"
@@ -659,6 +671,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"
@@ -677,6 +690,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"
@@ -695,6 +709,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"
@@ -713,6 +728,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"
@@ -724,6 +740,7 @@ 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 +829,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 +890,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
@@ -881,6 +918,7 @@ 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 +1311,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"
@@ -1354,6 +1400,7 @@ 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"
@@ -1365,6 +1412,7 @@ 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'."
@@ -1608,6 +1656,7 @@ 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"
@@ -1619,6 +1668,7 @@ 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"
@@ -1674,6 +1724,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
 #, fuzzy, python-format
@@ -1777,6 +1828,7 @@ 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 +1908,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"
@@ -1873,18 +1939,21 @@ 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 "
@@ -1894,6 +1963,7 @@ 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 "
@@ -1904,6 +1974,7 @@ 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 "
@@ -1914,6 +1985,7 @@ 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 "
@@ -1924,6 +1996,7 @@ 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_BR.po b/contract/i18n/pt_BR.po
index 7c9a50aab..01a343ff7 100644
--- a/contract/i18n/pt_BR.po
+++ b/contract/i18n/pt_BR.po
@@ -263,6 +263,7 @@ 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 ""
@@ -271,6 +272,7 @@ 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 ""
@@ -279,6 +281,7 @@ 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 "Uma linha de contrato com uma sucessora deve ter uma data final"
@@ -334,6 +337,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 "Uma linha de renovação automática deve possuir uma data final"
@@ -426,6 +430,7 @@ 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"
@@ -475,6 +480,7 @@ 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"
@@ -610,6 +616,7 @@ 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 ""
@@ -617,30 +624,35 @@ 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 "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"
@@ -655,6 +667,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"
@@ -673,6 +686,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"
@@ -691,6 +705,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"
@@ -709,6 +724,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"
@@ -720,6 +736,7 @@ 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 +823,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 +884,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
@@ -875,6 +912,7 @@ 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 +1303,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"
@@ -1346,6 +1393,7 @@ 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"
@@ -1357,6 +1405,7 @@ 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'."
@@ -1600,6 +1649,7 @@ 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"
@@ -1611,6 +1661,7 @@ 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"
@@ -1666,6 +1717,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
 #, fuzzy, python-format
@@ -1768,6 +1820,7 @@ 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 +1900,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"
@@ -1864,18 +1931,21 @@ 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 "
@@ -1886,6 +1956,7 @@ 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 "
@@ -1896,6 +1967,7 @@ msgstr ""
 
 #. 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 "
@@ -1909,6 +1981,7 @@ 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 "
@@ -1919,6 +1992,7 @@ 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_PT.po b/contract/i18n/pt_PT.po
index b88192f92..80f2ec923 100644
--- a/contract/i18n/pt_PT.po
+++ b/contract/i18n/pt_PT.po
@@ -191,18 +191,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 ""
@@ -258,6 +261,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 ""
@@ -346,6 +350,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 ""
@@ -395,6 +400,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -524,36 +530,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"
@@ -564,6 +576,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"
@@ -576,6 +589,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"
@@ -588,6 +602,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"
@@ -600,6 +615,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 ""
@@ -611,6 +627,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="
@@ -697,6 +714,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 +773,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
@@ -766,6 +801,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 ""
@@ -1151,6 +1187,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,6 +1273,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 ""
@@ -1241,6 +1285,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 ""
@@ -1476,6 +1521,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 ""
@@ -1487,6 +1533,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 ""
@@ -1542,6 +1589,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
@@ -1631,6 +1679,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 ""
@@ -1710,6 +1759,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"
@@ -1727,18 +1790,21 @@ 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 "
@@ -1747,6 +1813,7 @@ 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 "
@@ -1755,6 +1822,7 @@ 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 "
@@ -1763,6 +1831,7 @@ 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 "
@@ -1771,6 +1840,7 @@ 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..8c7f5dc72 100644
--- a/contract/i18n/ro.po
+++ b/contract/i18n/ro.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -345,6 +349,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 ""
@@ -394,6 +399,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -523,36 +529,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"
@@ -563,6 +575,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"
@@ -575,6 +588,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"
@@ -587,6 +601,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"
@@ -599,6 +614,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 ""
@@ -610,6 +626,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="
@@ -696,6 +713,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 +772,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,6 +800,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 ""
@@ -1150,6 +1186,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,6 +1272,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 ""
@@ -1240,6 +1284,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 ""
@@ -1475,6 +1520,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 ""
@@ -1486,6 +1532,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 ""
@@ -1541,6 +1588,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
@@ -1630,6 +1678,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 ""
@@ -1709,6 +1758,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,18 +1789,21 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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,6 +1839,7 @@ 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..957d43a57 100644
--- a/contract/i18n/ru.po
+++ b/contract/i18n/ru.po
@@ -191,18 +191,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 ""
@@ -258,6 +261,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 ""
@@ -343,6 +347,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 ""
@@ -392,6 +397,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -533,36 +539,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"
@@ -573,6 +585,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"
@@ -585,6 +598,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"
@@ -597,6 +611,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"
@@ -609,6 +624,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 ""
@@ -622,6 +638,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="
@@ -710,6 +727,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 +787,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
@@ -780,6 +815,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 ""
@@ -1175,6 +1211,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"
@@ -1255,6 +1300,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 ""
@@ -1266,6 +1312,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 ""
@@ -1507,6 +1554,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 ""
@@ -1518,6 +1566,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 ""
@@ -1575,6 +1624,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
 #, fuzzy, python-format
@@ -1665,6 +1715,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 ""
@@ -1744,6 +1795,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"
@@ -1761,18 +1826,21 @@ 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 "
@@ -1781,6 +1849,7 @@ 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 "
@@ -1789,6 +1858,7 @@ 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 "
@@ -1797,6 +1867,7 @@ 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 "
@@ -1805,6 +1876,7 @@ 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..7fce13651 100644
--- a/contract/i18n/sk.po
+++ b/contract/i18n/sk.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..97b28c909 100644
--- a/contract/i18n/sk_SK.po
+++ b/contract/i18n/sk_SK.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -345,6 +349,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 ""
@@ -394,6 +399,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -523,36 +529,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"
@@ -563,6 +575,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"
@@ -575,6 +588,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"
@@ -587,6 +601,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"
@@ -599,6 +614,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 ""
@@ -610,6 +626,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="
@@ -694,6 +711,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 +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
@@ -763,6 +798,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 ""
@@ -1144,6 +1180,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"
@@ -1223,6 +1266,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 ""
@@ -1234,6 +1278,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 ""
@@ -1469,6 +1514,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 ""
@@ -1480,6 +1526,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 ""
@@ -1535,6 +1582,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
@@ -1624,6 +1672,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 ""
@@ -1703,6 +1752,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"
@@ -1720,18 +1783,21 @@ 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 "
@@ -1740,6 +1806,7 @@ 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 "
@@ -1748,6 +1815,7 @@ 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 "
@@ -1756,6 +1824,7 @@ 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 "
@@ -1764,6 +1833,7 @@ 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..92e16cf4e 100644
--- a/contract/i18n/sl.po
+++ b/contract/i18n/sl.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -345,6 +349,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 ""
@@ -394,6 +399,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -523,36 +529,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"
@@ -563,6 +575,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"
@@ -575,6 +588,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"
@@ -587,6 +601,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"
@@ -599,6 +614,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 ""
@@ -610,6 +626,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="
@@ -696,6 +713,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 +772,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,6 +800,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 ""
@@ -1152,6 +1188,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"
@@ -1231,6 +1274,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 ""
@@ -1242,6 +1286,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 ""
@@ -1479,6 +1524,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 ""
@@ -1490,6 +1536,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 ""
@@ -1545,6 +1592,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
@@ -1634,6 +1682,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 ""
@@ -1713,6 +1762,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"
@@ -1730,18 +1793,21 @@ 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 "
@@ -1750,6 +1816,7 @@ 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 "
@@ -1758,6 +1825,7 @@ 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 "
@@ -1766,6 +1834,7 @@ 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 "
@@ -1774,6 +1843,7 @@ 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..e03891e27 100644
--- a/contract/i18n/sr.po
+++ b/contract/i18n/sr.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1140,6 +1176,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,6 +1262,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 ""
@@ -1230,6 +1274,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 ""
@@ -1465,6 +1510,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 ""
@@ -1476,6 +1522,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 ""
@@ -1531,6 +1578,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
@@ -1620,6 +1668,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 ""
@@ -1699,6 +1748,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,18 +1779,21 @@ 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,6 +1802,7 @@ 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,6 +1811,7 @@ 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,6 +1820,7 @@ 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,6 +1829,7 @@ 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..a02b904fe 100644
--- a/contract/i18n/sr@latin.po
+++ b/contract/i18n/sr@latin.po
@@ -191,18 +191,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 ""
@@ -258,6 +261,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 ""
@@ -342,6 +346,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 ""
@@ -391,6 +396,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -518,36 +524,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"
@@ -558,6 +570,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"
@@ -570,6 +583,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"
@@ -582,6 +596,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"
@@ -594,6 +609,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 ""
@@ -605,6 +621,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="
@@ -691,6 +708,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 +767,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
@@ -760,6 +795,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..f52e9bca5 100644
--- a/contract/i18n/sv.po
+++ b/contract/i18n/sv.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..9367eaa8c 100644
--- a/contract/i18n/th.po
+++ b/contract/i18n/th.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1141,6 +1177,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,6 +1263,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 ""
@@ -1231,6 +1275,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 ""
@@ -1466,6 +1511,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 ""
@@ -1477,6 +1523,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 ""
@@ -1532,6 +1579,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
@@ -1621,6 +1669,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 ""
@@ -1700,6 +1749,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,18 +1780,21 @@ 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,6 +1803,7 @@ 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,6 +1812,7 @@ 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,6 +1821,7 @@ 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,6 +1830,7 @@ 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..7a4ffb64b 100644
--- a/contract/i18n/tr.po
+++ b/contract/i18n/tr.po
@@ -258,18 +258,21 @@ 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 ""
@@ -327,6 +330,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 ""
@@ -417,6 +421,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 ""
@@ -468,6 +473,7 @@ 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"
@@ -616,6 +622,7 @@ 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"
@@ -623,30 +630,35 @@ 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"
@@ -657,6 +669,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"
@@ -669,6 +682,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"
@@ -681,6 +695,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"
@@ -693,6 +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 ""
@@ -706,6 +722,7 @@ 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 +816,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 +876,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
@@ -869,6 +904,7 @@ 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 +1313,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"
@@ -1360,6 +1405,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 ""
@@ -1371,6 +1417,7 @@ 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."
@@ -1624,6 +1671,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 ""
@@ -1635,6 +1683,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 ""
@@ -1693,6 +1742,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
 #, fuzzy, python-format
@@ -1784,6 +1834,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 ""
@@ -1865,6 +1916,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"
@@ -1882,18 +1947,21 @@ 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 "
@@ -1902,6 +1970,7 @@ 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 "
@@ -1910,6 +1979,7 @@ 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 "
@@ -1918,6 +1988,7 @@ 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 "
@@ -1926,6 +1997,7 @@ 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..fbaa75522 100644
--- a/contract/i18n/tr_TR.po
+++ b/contract/i18n/tr_TR.po
@@ -191,18 +191,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 ""
@@ -258,6 +261,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 ""
@@ -347,6 +351,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 ""
@@ -396,6 +401,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -537,36 +543,42 @@ 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"
@@ -577,6 +589,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"
@@ -589,6 +602,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"
@@ -601,6 +615,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"
@@ -613,6 +628,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 ""
@@ -626,6 +642,7 @@ 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 +731,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 +791,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
@@ -784,6 +819,7 @@ 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 +1226,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"
@@ -1271,6 +1316,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 ""
@@ -1282,6 +1328,7 @@ 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."
@@ -1529,6 +1576,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 ""
@@ -1540,6 +1588,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 ""
@@ -1597,6 +1646,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
 #, fuzzy, python-format
@@ -1687,6 +1737,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 ""
@@ -1766,6 +1817,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"
@@ -1783,18 +1848,21 @@ 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 "
@@ -1803,6 +1871,7 @@ 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 "
@@ -1811,6 +1880,7 @@ 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 "
@@ -1819,6 +1889,7 @@ 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 "
@@ -1827,6 +1898,7 @@ 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..6c086b761 100644
--- a/contract/i18n/uk.po
+++ b/contract/i18n/uk.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..dd1545ae2 100644
--- a/contract/i18n/vi.po
+++ b/contract/i18n/vi.po
@@ -189,18 +189,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 ""
@@ -256,6 +259,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 ""
@@ -340,6 +344,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 ""
@@ -389,6 +394,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -516,36 +522,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"
@@ -556,6 +568,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"
@@ -568,6 +581,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"
@@ -580,6 +594,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"
@@ -592,6 +607,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 ""
@@ -603,6 +619,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="
@@ -689,6 +706,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 +765,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,6 +793,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 ""
@@ -1139,6 +1175,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,6 +1261,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 ""
@@ -1229,6 +1273,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 ""
@@ -1464,6 +1509,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 ""
@@ -1475,6 +1521,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 ""
@@ -1530,6 +1577,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
@@ -1619,6 +1667,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 ""
@@ -1698,6 +1747,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,18 +1778,21 @@ 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,6 +1801,7 @@ 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,6 +1810,7 @@ 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,6 +1819,7 @@ 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,6 +1828,7 @@ 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..8a242f1f8 100644
--- a/contract/i18n/vi_VN.po
+++ b/contract/i18n/vi_VN.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1142,6 +1178,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,6 +1264,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 ""
@@ -1232,6 +1276,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 ""
@@ -1467,6 +1512,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 ""
@@ -1478,6 +1524,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 ""
@@ -1533,6 +1580,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
@@ -1622,6 +1670,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 ""
@@ -1701,6 +1750,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,18 +1781,21 @@ 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,6 +1804,7 @@ 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,6 +1813,7 @@ 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,6 +1822,7 @@ 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,6 +1831,7 @@ 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..73deceaf4 100644
--- a/contract/i18n/zh_CN.po
+++ b/contract/i18n/zh_CN.po
@@ -254,18 +254,21 @@ 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 "与接替的合同行必须有结束日期"
@@ -321,6 +324,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 "自动续订行必须有结束日期"
@@ -413,6 +417,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 "取消此行不允许"
@@ -464,6 +469,7 @@ msgstr "公司"
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr "编写Email"
@@ -605,36 +611,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 "合同行'%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"
@@ -649,6 +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"
@@ -667,6 +680,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"
@@ -685,6 +699,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"
@@ -703,6 +718,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 "必须在删除前取消合同行"
@@ -714,6 +730,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="
@@ -805,6 +822,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 +883,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
@@ -874,6 +911,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 "折扣应小于或等于100"
@@ -1265,6 +1303,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"
@@ -1344,6 +1391,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 "计划接替不允许此行"
@@ -1355,6 +1403,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 "请为定义一个%s日记账，公司 '%s'。"
@@ -1596,6 +1645,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 "停止不允许此行"
@@ -1607,6 +1657,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 "此线路不允许停止/计划接替"
@@ -1662,6 +1713,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
 #, fuzzy, python-format
@@ -1762,6 +1814,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 "此行不允许取消"
@@ -1841,6 +1894,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"
@@ -1858,18 +1925,21 @@ 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 "
@@ -1878,6 +1948,7 @@ 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 "
@@ -1886,6 +1957,7 @@ 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 "
@@ -1897,6 +1969,7 @@ 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 "
@@ -1905,6 +1978,7 @@ 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..1c674c053 100644
--- a/contract/i18n/zh_TW.po
+++ b/contract/i18n/zh_TW.po
@@ -190,18 +190,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 ""
@@ -257,6 +260,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 ""
@@ -341,6 +345,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 ""
@@ -390,6 +395,7 @@ msgstr ""
 
 #. module: contract
 #: code:addons/contract/models/contract.py:345
+#: code:addons/contract/models/contract.py:346
 #, python-format
 msgid "Compose Email"
 msgstr ""
@@ -517,36 +523,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"
@@ -557,6 +569,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"
@@ -569,6 +582,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"
@@ -581,6 +595,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"
@@ -593,6 +608,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 ""
@@ -604,6 +620,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="
@@ -690,6 +707,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 +766,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,6 +794,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 ""
@@ -1140,6 +1176,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,6 +1262,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 ""
@@ -1230,6 +1274,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 ""
@@ -1465,6 +1510,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 ""
@@ -1476,6 +1522,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 ""
@@ -1531,6 +1578,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
@@ -1620,6 +1668,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 ""
@@ -1699,6 +1748,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,18 +1779,21 @@ 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,6 +1802,7 @@ 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,6 +1811,7 @@ 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,6 +1820,7 @@ 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,6 +1829,7 @@ 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 ""